Update Gradle version

iZettle · Oct 24, 2023 · a09e32d · a09e32d
1 parent 462de2b
commit a09e32d
Show file tree

Hide file tree

Showing 10 changed files with 214 additions and 147 deletions.
diff --git a/Examples/Example-Java/app/build.gradle b/Examples/Example-Java/app/build.gradle
@@ -1,12 +1,13 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 32
+    namespace "com.zettle.payments.android.java_example"
+    compileSdk 33
 
     defaultConfig {
         applicationId "com.zettle.payments.android.java_example"
         minSdkVersion 21
-        targetSdkVersion 32
+        targetSdkVersion 33
         versionCode 1
         versionName "1.0"
         multiDexEnabled true

diff --git a/Examples/Example-Java/build.gradle b/Examples/Example-Java/build.gradle
@@ -12,7 +12,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.2'
+        classpath 'com.android.tools.build:gradle:8.1.2'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

diff --git a/Examples/Example-Java/gradle/wrapper/gradle-wrapper.properties b/Examples/Example-Java/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Mon Jun 27 15:23:40 CEST 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/Examples/Example-Kotlin/app/build.gradle b/Examples/Example-Kotlin/app/build.gradle
@@ -3,12 +3,13 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-parcelize'
 
 android {
-    compileSdkVersion 32
+    namespace "com.zettle.payments.android.kotlin_example"
+    compileSdk 33
 
     defaultConfig {
         applicationId "com.zettle.payments.android.kotlin_example"
         minSdkVersion 21
-        targetSdkVersion 32
+        targetSdk 33
         versionCode 1
         versionName "1.0"
         multiDexEnabled true
@@ -49,8 +50,8 @@ dependencies {
     implementation "com.zettle.sdk.feature.qrc:paypal-ui:$zettle_version"
     implementation "com.zettle.sdk.feature.qrc:venmo-ui:$zettle_version"
 
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation 'androidx.appcompat:appcompat:1.4.2'
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
+    implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation 'com.google.android.material:material:1.6.1'
     implementation 'androidx.multidex:multidex:2.0.1'

diff --git a/...Kotlin/app/src/main/java/com/zettle/payments/android/kotlin_example/CardReaderActivity.kt b/...Kotlin/app/src/main/java/com/zettle/payments/android/kotlin_example/CardReaderActivity.kt
@@ -104,8 +104,9 @@ class CardReaderActivity : AppCompatActivity() {
                     val refund : RefundResult.Completed = CardReaderAction.fromRefundResult(result)
                     showResultSheet(refund.payload.toPaymentResultData())
                 }
-                is RefundResult.Canceled -> showSnackBar("Refund canceled")
-                is RefundResult.Failed -> showSnackBar("Refund failed Reason#${result.reason}")
+                is ZettleResult.Cancelled -> showSnackBar("Refund canceled")
+                is ZettleResult.Failed -> showSnackBar("Refund failed Reason#${result.reason}")
+                null -> showSnackBar("Problem... null")
             }
         }
 

diff --git a/Examples/Example-Kotlin/build.gradle b/Examples/Example-Kotlin/build.gradle
@@ -2,8 +2,8 @@
 
 buildscript {
 
-    ext.kotlin_version = '1.6.0'
-    ext.zettle_version = '2.1.5'
+    ext.kotlin_version = '1.8.22'
+    ext.zettle_version = '2.6.4'
 
     apply from: 'zettleSDK.gradle'
 
@@ -12,10 +12,8 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.2'
+        classpath 'com.android.tools.build:gradle:8.1.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath 'com.google.gms:google-services:4.3.13'
-        classpath 'com.google.firebase:firebase-appdistribution-gradle:2.0.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

diff --git a/Examples/Example-Kotlin/gradle/wrapper/gradle-wrapper.jar b/Examples/Example-Kotlin/gradle/wrapper/gradle-wrapper.jar
diff --git a/Examples/Example-Kotlin/gradle/wrapper/gradle-wrapper.properties b/Examples/Example-Kotlin/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Mon Jun 27 15:23:40 CEST 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists