Merge pull request #422 from getbouncer/awush-downgrade-kotlin-gradle…

…-plugin Downgrade kotlin gradle plugin
getbouncer · Jul 15, 2021 · 017ddca · 017ddca
2 parents 4e27057 + de7170c
commit 017ddca
Show file tree

Hide file tree

Showing 14 changed files with 34 additions and 29 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -13,7 +13,7 @@ jobs:
       - name: checkout
         uses: actions/checkout@v2
         with:
-          ref: "master"
+          ref: ${{ github.event.release.target_commitish }}
           token: ${{secrets.SERVICE_PERSONAL_ACCESS_TOKEN}}
           submodules: recursive
 
@@ -40,7 +40,7 @@ jobs:
       - name: checkout
         uses: actions/checkout@v2
         with:
-          ref: "master"
+          ref: ${{ github.event.release.target_commitish }}
           token: ${{secrets.SERVICE_PERSONAL_ACCESS_TOKEN}}
           submodules: recursive
 
@@ -83,7 +83,7 @@ jobs:
         id: commit
         uses: stefanzweifel/git-auto-commit-action@v4
         with:
-          branch: master
+          branch: ${{ github.event.release.target_commitish }}
           commit_message: "Automatic changelog update"
           file_pattern: "gradle.properties CHANGELOG.md"
 
@@ -96,7 +96,7 @@ jobs:
       - name: checkout
         uses: actions/checkout@v2
         with:
-          ref: "master"
+          ref: ${{ github.event.release.target_commitish }}
           token: ${{secrets.SERVICE_PERSONAL_ACCESS_TOKEN}}
           submodules: recursive
 

diff --git a/build.gradle b/build.gradle
@@ -10,14 +10,14 @@ buildscript {
 
     dependencies {
         classpath 'com.android.tools.build:gradle:4.2.2'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.21"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.32"
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }
 }
 
 plugins {
-    id 'org.jetbrains.kotlin.plugin.serialization' version "1.5.21"
+    id 'org.jetbrains.kotlin.plugin.serialization' version "1.4.32"
     id 'org.jetbrains.dokka' version '1.5.0'
     id "io.github.gradle-nexus.publish-plugin" version "1.1.0"
 }

diff --git a/cardscan-demo/build.gradle b/cardscan-demo/build.gradle
@@ -52,11 +52,11 @@ dependencies {
     testImplementation "androidx.test:core:1.4.0"
     testImplementation "androidx.test:runner:1.4.0"
     testImplementation "junit:junit:4.13.2"
-    testImplementation "org.jetbrains.kotlin:kotlin-test:1.5.21"
+    testImplementation "org.jetbrains.kotlin:kotlin-test:1.4.32"
 }
 
 dependencies {
     androidTestImplementation "androidx.test.ext:junit:1.1.3"
     androidTestImplementation "androidx.test.espresso:espresso-core:3.4.0"
-    androidTestImplementation "org.jetbrains.kotlin:kotlin-test:1.5.21"
+    androidTestImplementation "org.jetbrains.kotlin:kotlin-test:1.4.32"
 }
diff --git a/cardscan-ui/build.gradle b/cardscan-ui/build.gradle
@@ -54,14 +54,14 @@ dependencies {
     testImplementation "androidx.test:core:1.4.0"
     testImplementation "androidx.test:runner:1.4.0"
     testImplementation "junit:junit:4.13.2"
-    testImplementation "org.jetbrains.kotlin:kotlin-test:1.5.21"
+    testImplementation "org.jetbrains.kotlin:kotlin-test:1.4.32"
     testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.4.3"
 }
 
 dependencies {
     androidTestImplementation "androidx.test.ext:junit:1.1.3"
     androidTestImplementation "androidx.test.espresso:espresso-core:3.4.0"
-    androidTestImplementation "org.jetbrains.kotlin:kotlin-test:1.5.21"
+    androidTestImplementation "org.jetbrains.kotlin:kotlin-test:1.4.32"
 }
 
 apply from: 'deploy.gradle'
diff --git a/scan-camera/build.gradle b/scan-camera/build.gradle
@@ -47,14 +47,14 @@ dependencies {
     testImplementation "androidx.test:core:1.4.0"
     testImplementation "androidx.test:runner:1.4.0"
     testImplementation "junit:junit:4.13.2"
-    testImplementation "org.jetbrains.kotlin:kotlin-test:1.5.21"
+    testImplementation "org.jetbrains.kotlin:kotlin-test:1.4.32"
     testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.4.3"
 }
 
 dependencies {
     androidTestImplementation "androidx.test.ext:junit:1.1.3"
     androidTestImplementation "androidx.test.espresso:espresso-core:3.4.0"
-    androidTestImplementation "org.jetbrains.kotlin:kotlin-test:1.5.21"
+    androidTestImplementation "org.jetbrains.kotlin:kotlin-test:1.4.32"
 }
 
 apply from: 'deploy.gradle'
diff --git a/scan-camera2/build.gradle b/scan-camera2/build.gradle
@@ -47,13 +47,13 @@ dependencies {
     testImplementation "androidx.test:core:1.4.0"
     testImplementation "androidx.test:runner:1.4.0"
     testImplementation "junit:junit:4.13.2"
-    testImplementation "org.jetbrains.kotlin:kotlin-test:1.5.21"
+    testImplementation "org.jetbrains.kotlin:kotlin-test:1.4.32"
 }
 
 dependencies {
     androidTestImplementation "androidx.test.ext:junit:1.1.3"
     androidTestImplementation "androidx.test.espresso:espresso-core:3.4.0"
-    androidTestImplementation "org.jetbrains.kotlin:kotlin-test:1.5.21"
+    androidTestImplementation "org.jetbrains.kotlin:kotlin-test:1.4.32"
 }
 
 apply from: 'deploy.gradle'
diff --git a/scan-camerax/build.gradle b/scan-camerax/build.gradle
@@ -51,13 +51,13 @@ dependencies {
     testImplementation "androidx.test:core:1.4.0"
     testImplementation "androidx.test:runner:1.4.0"
     testImplementation "junit:junit:4.13.2"
-    testImplementation "org.jetbrains.kotlin:kotlin-test:1.5.21"
+    testImplementation "org.jetbrains.kotlin:kotlin-test:1.4.32"
 }
 
 dependencies {
     androidTestImplementation "androidx.test.ext:junit:1.1.3"
     androidTestImplementation "androidx.test.espresso:espresso-core:3.4.0"
-    androidTestImplementation "org.jetbrains.kotlin:kotlin-test:1.5.21"
+    androidTestImplementation "org.jetbrains.kotlin:kotlin-test:1.4.32"
 }
 
 apply from: 'deploy.gradle'
diff --git a/scan-framework/build.gradle b/scan-framework/build.gradle
@@ -58,14 +58,14 @@ dependencies {
     testImplementation "androidx.test:core:1.4.0"
     testImplementation "androidx.test:runner:1.4.0"
     testImplementation "junit:junit:4.13.2"
-    testImplementation "org.jetbrains.kotlin:kotlin-test:1.5.21"
+    testImplementation "org.jetbrains.kotlin:kotlin-test:1.4.32"
     testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.4.3"
 }
 
 dependencies {
     androidTestImplementation "androidx.test.espresso:espresso-core:3.4.0"
     androidTestImplementation "androidx.test.ext:junit:1.1.3"
-    androidTestImplementation "org.jetbrains.kotlin:kotlin-test:1.5.21"
+    androidTestImplementation "org.jetbrains.kotlin:kotlin-test:1.4.32"
     androidTestImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.4.3"
 }
 

diff --git a/scan-framework/src/main/java/com/getbouncer/scan/framework/util/Device.kt b/scan-framework/src/main/java/com/getbouncer/scan/framework/util/Device.kt
@@ -110,8 +110,11 @@ fun getPlatform() = "android"
  * from https://stackoverflow.com/a/27836910/947883
  */
 fun getDeviceName(): String {
-    val manufacturer = Build.MANUFACTURER?.lowercase() ?: ""
-    val model = Build.MODEL?.lowercase() ?: ""
+    // TODO: change this back once we can support newer kotlin versions
+//    val manufacturer = Build.MANUFACTURER?.lowercase() ?: ""
+//    val model = Build.MODEL?.lowercase() ?: ""
+    val manufacturer = Build.MANUFACTURER?.toLowerCase(Locale.ROOT) ?: ""
+    val model = Build.MODEL?.toLowerCase(Locale.ROOT) ?: ""
     return if (model.startsWith(manufacturer)) {
         model
     } else {

diff --git a/scan-payment-full/build.gradle b/scan-payment-full/build.gradle
@@ -58,13 +58,13 @@ dependencies {
     testImplementation "androidx.test:core:1.4.0"
     testImplementation "androidx.test:runner:1.4.0"
     testImplementation "junit:junit:4.13.2"
-    testImplementation "org.jetbrains.kotlin:kotlin-test:1.5.21"
+    testImplementation "org.jetbrains.kotlin:kotlin-test:1.4.32"
 }
 
 dependencies {
     androidTestImplementation "androidx.test.espresso:espresso-core:3.4.0"
     androidTestImplementation "androidx.test.ext:junit:1.1.3"
-    androidTestImplementation "org.jetbrains.kotlin:kotlin-test:1.5.21"
+    androidTestImplementation "org.jetbrains.kotlin:kotlin-test:1.4.32"
     androidTestImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.4.3"
 }
 

diff --git a/scan-payment-minimal/build.gradle b/scan-payment-minimal/build.gradle
@@ -54,13 +54,13 @@ dependencies {
     testImplementation "androidx.test:core:1.4.0"
     testImplementation "androidx.test:runner:1.4.0"
     testImplementation "junit:junit:4.13.2"
-    testImplementation "org.jetbrains.kotlin:kotlin-test:1.5.21"
+    testImplementation "org.jetbrains.kotlin:kotlin-test:1.4.32"
 }
 
 dependencies {
     androidTestImplementation "androidx.test.espresso:espresso-core:3.4.0"
     androidTestImplementation "androidx.test.ext:junit:1.1.3"
-    androidTestImplementation "org.jetbrains.kotlin:kotlin-test:1.5.21"
+    androidTestImplementation "org.jetbrains.kotlin:kotlin-test:1.4.32"
     androidTestImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.4.3"
 }
 

diff --git a/scan-payment/build.gradle b/scan-payment/build.gradle
@@ -53,13 +53,13 @@ dependencies {
     testImplementation "androidx.test:core:1.4.0"
     testImplementation "androidx.test:runner:1.4.0"
     testImplementation "junit:junit:4.13.2"
-    testImplementation "org.jetbrains.kotlin:kotlin-test:1.5.21"
+    testImplementation "org.jetbrains.kotlin:kotlin-test:1.4.32"
 }
 
 dependencies {
     androidTestImplementation "androidx.test.espresso:espresso-core:3.4.0"
     androidTestImplementation "androidx.test.ext:junit:1.1.3"
-    androidTestImplementation "org.jetbrains.kotlin:kotlin-test:1.5.21"
+    androidTestImplementation "org.jetbrains.kotlin:kotlin-test:1.4.32"
     androidTestImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.4.3"
 }
 

diff --git a/scan-payment/src/main/java/com/getbouncer/scan/payment/ml/AlphabetDetect.kt b/scan-payment/src/main/java/com/getbouncer/scan/payment/ml/AlphabetDetect.kt
@@ -37,7 +37,9 @@ class AlphabetDetect private constructor(interpreter: Interpreter) :
         val prediction = mlOutput[0]
         val index = prediction.indexOfMax()
         val character = if (index != null && index > 0) {
-            ('A'.code - 1 + index).toChar()
+            // TODO: change this back once we support newer gradle versions
+//            ('A'.code - 1 + index).toChar()
+            ('A'.toInt() - 1 + index).toChar()
         } else {
             ' '
         }

diff --git a/scan-ui/build.gradle b/scan-ui/build.gradle
@@ -49,13 +49,13 @@ dependencies {
     testImplementation "androidx.test:core:1.4.0"
     testImplementation "androidx.test:runner:1.4.0"
     testImplementation "junit:junit:4.13.2"
-    testImplementation "org.jetbrains.kotlin:kotlin-test:1.5.21"
+    testImplementation "org.jetbrains.kotlin:kotlin-test:1.4.32"
 }
 
 dependencies {
     androidTestImplementation "androidx.test.ext:junit:1.1.3"
     androidTestImplementation "androidx.test.espresso:espresso-core:3.4.0"
-    androidTestImplementation "org.jetbrains.kotlin:kotlin-test:1.5.21"
+    androidTestImplementation "org.jetbrains.kotlin:kotlin-test:1.4.32"
 }
 
 apply from: 'deploy.gradle'