Pedro/sdk kotlin 1.8 (#139)

* Update AGP version * Update Kotlin to 1.8.x, along with various library dependencies * Update Dev App versions and baseline lint files
cashapp · Jan 12, 2024 · 3b8e953 · 3b8e953
1 parent c96b2f0
commit 3b8e953
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 116 deletions.
diff --git a/analytics-core/build.gradle b/analytics-core/build.gradle
@@ -25,11 +25,11 @@ android {
     }
   }
   compileOptions {
-    sourceCompatibility JavaVersion.VERSION_1_8
-    targetCompatibility JavaVersion.VERSION_1_8
+    sourceCompatibility JavaVersion.VERSION_11
+    targetCompatibility JavaVersion.VERSION_11
   }
-  kotlinOptions {
-    jvmTarget = '1.8'
+  kotlin {
+    jvmToolchain(11)
   }
 
   lintOptions {

diff --git a/analytics-core/lint-baseline.xml b/analytics-core/lint-baseline.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 7.3.1" type="baseline" client="gradle" dependencies="false" name="AGP (7.3.1)" variant="all" version="7.3.1">
+<issues format="6" by="lint 8.2.1" type="baseline" client="gradle" dependencies="false" name="AGP (8.2.1)" variant="all" version="8.2.1">
 
 </issues>
diff --git a/build.gradle b/build.gradle
@@ -1,20 +1,20 @@
 import com.vanniktech.maven.publish.SonatypeHost
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
   ext {
     junit_androidx_version = '1.1.5'
     junit_version = '4.13.2'
-    moshi_version = '1.13.0'
-    lifecycle_version = '2.5.1'
-    mockk_version = '1.13.3'
-    coroutines_test_version = '1.6.4'
+    moshi_version = '1.15.0'
+    lifecycle_version = '2.6.2'
+    mockk_version = '1.13.5'
+    coroutines_test_version = '1.7.3'
     robolectric_version = '4.11.1'
-    mockwebserver_version = '4.10.0'
-    google_truth_version = '1.1.5'
+    google_truth_version = '1.2.0'
     startup_version = '1.1.1'
-    okhttp_version = '4.11.0'
-    kotlinx_date_version = '0.4.0'
+    okhttp_version = '4.12.0'
+    kotlinx_date_version = '0.4.1'
 
     versions = [
         'minSdk': 21,
@@ -25,9 +25,9 @@ buildscript {
 }
 
 plugins {
-  id 'com.android.application' version '8.2.0' apply false
-  id 'com.android.library' version '8.2.0' apply false
-  id 'org.jetbrains.kotlin.android' version '1.6.21' apply false
+  id 'com.android.application' version '8.2.1' apply false
+  id 'com.android.library' version '8.2.1' apply false
+  id 'org.jetbrains.kotlin.android' version '1.8.21' apply false
   id "com.diffplug.spotless" version "6.20.0"
   id "com.vanniktech.maven.publish.base" version "0.25.1"
 }
@@ -55,6 +55,7 @@ subprojects { subproject ->
 def NEXT_VERSION = "2.4.1-SNAPSHOT"
 
 allprojects {
+
   group = 'app.cash.paykit'
   version = '2.4.0-SNAPSHOT'
 

diff --git a/core/build.gradle b/core/build.gradle
@@ -1,7 +1,7 @@
 plugins {
   id 'com.android.library'
   id 'org.jetbrains.kotlin.android'
-  id("com.google.devtools.ksp").version("1.6.21-1.0.5")
+  id("com.google.devtools.ksp").version("1.8.21-1.0.11")
   id 'project-report' // run ./gradlew htmlDependencyReport
   id "com.vanniktech.maven.publish.base"
 }
@@ -34,11 +34,11 @@ android {
   }
 
   compileOptions {
-    sourceCompatibility JavaVersion.VERSION_1_8
-    targetCompatibility JavaVersion.VERSION_1_8
+    sourceCompatibility JavaVersion.VERSION_11
+    targetCompatibility JavaVersion.VERSION_11
   }
-  kotlinOptions {
-    jvmTarget = '1.8'
+  kotlin {
+    jvmToolchain(11)
   }
 
   resourcePrefix 'cap_'
@@ -92,7 +92,7 @@ dependencies {
   testImplementation "io.mockk:mockk:$mockk_version"
   testImplementation "com.google.truth:truth:$google_truth_version"
   androidTestImplementation "androidx.test.ext:junit-ktx:$junit_androidx_version"
-  testImplementation "com.squareup.okhttp3:mockwebserver:$mockwebserver_version"
+  testImplementation "com.squareup.okhttp3:mockwebserver:$okhttp_version"
   // Robolectric environment.
   testImplementation "org.robolectric:robolectric:$robolectric_version"
   // Coroutines test support.

diff --git a/core/lint-baseline.xml b/core/lint-baseline.xml
@@ -1,92 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 7.4.2" type="baseline" client="gradle" dependencies="false" name="AGP (7.4.2)" variant="all" version="7.4.2">
-
-    <issue
-        id="UnusedResources"
-        message="The resource `R.drawable.cap_btn_background_dark` appears to be unused"
-        errorLine1="&lt;ripple xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;"
-        errorLine2="^">
-        <location
-            file="src/main/res/drawable/cap_btn_background_dark.xml"
-            line="2"
-            column="1"/>
-    </issue>
-
-    <issue
-        id="UnusedResources"
-        message="The resource `R.drawable.cap_btn_background_light` appears to be unused"
-        errorLine1="&lt;ripple xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;"
-        errorLine2="^">
-        <location
-            file="src/main/res/drawable/cap_btn_background_light.xml"
-            line="2"
-            column="1"/>
-    </issue>
-
-    <issue
-        id="UnusedResources"
-        message="The resource `R.drawable.cap_logo_dark` appears to be unused"
-        errorLine1="&lt;vector xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;"
-        errorLine2="^">
-        <location
-            file="src/main/res/drawable/cap_logo_dark.xml"
-            line="1"
-            column="1"/>
-    </issue>
-
-    <issue
-        id="UnusedResources"
-        message="The resource `R.drawable.cap_logo_light` appears to be unused"
-        errorLine1="&lt;vector xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;"
-        errorLine2="^">
-        <location
-            file="src/main/res/drawable/cap_logo_light.xml"
-            line="1"
-            column="1"/>
-    </issue>
-
-    <issue
-        id="UnusedResources"
-        message="The resource `R.string.cap_a11_button_label` appears to be unused"
-        errorLine1="  &lt;string name=&quot;cap_a11_button_label&quot;>Cash App Pay&lt;/string>"
-        errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/values/strings.xml"
-            line="3"
-            column="11"/>
-    </issue>
-
-    <issue
-        id="UnusedResources"
-        message="The resource `R.style.CAPButtonStyle` appears to be unused"
-        errorLine1="  &lt;style name=&quot;CAPButtonStyle&quot; parent=&quot;android:Widget.ImageButton&quot;>"
-        errorLine2="         ~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/values/styles.xml"
-            line="4"
-            column="10"/>
-    </issue>
-
-    <issue
-        id="UnusedResources"
-        message="The resource `R.style.CAPButtonStyle_Light` appears to be unused"
-        errorLine1="  &lt;style name=&quot;CAPButtonStyle.Light&quot;>"
-        errorLine2="         ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/values/styles.xml"
-            line="10"
-            column="10"/>
-    </issue>
-
-    <issue
-        id="UnusedResources"
-        message="The resource `R.style.CAPButtonStyle_Dark` appears to be unused"
-        errorLine1="  &lt;style name=&quot;CAPButtonStyle.Dark&quot;>"
-        errorLine2="         ~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/values/styles.xml"
-            line="15"
-            column="10"/>
-    </issue>
+<issues format="6" by="lint 8.2.1" type="baseline" client="gradle" dependencies="false" name="AGP (8.2.1)" variant="all" version="8.2.1">
 
 </issues>
diff --git a/logging/build.gradle.kts b/logging/build.gradle.kts
@@ -26,12 +26,12 @@ android {
     }
   }
   compileOptions {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
+    sourceCompatibility = JavaVersion.VERSION_11
+    targetCompatibility = JavaVersion.VERSION_11
   }
 
-  kotlinOptions {
-    jvmTarget = "1.8"
+  kotlin {
+    jvmToolchain(11)
   }
 
   lint {

diff --git a/logging/lint-baseline.xml b/logging/lint-baseline.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 7.4.2" type="baseline" client="gradle" dependencies="false" name="AGP (7.4.2)" variant="all" version="7.4.2">
+<issues format="6" by="lint 8.2.1" type="baseline" client="gradle" dependencies="false" name="AGP (8.2.1)" variant="all" version="8.2.1">
 
 </issues>