Use JDK 20 and AGP 8.3.0-alpha09

msasikanth · Oct 22, 2023 · bd0785c · bd0785c
1 parent ede7b40
commit bd0785c
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 25 deletions.
diff --git a/.github/workflows/android_prod_release.yml b/.github/workflows/android_prod_release.yml
@@ -39,10 +39,10 @@ jobs:
           VERSION_CODE=${WORKFLOW_INPUT:-"1"}
           echo "ORG_GRADLE_PROJECT_VERSION_CODE=$VERSION_CODE" >> $GITHUB_ENV
 
-      - name: Setup JDK 17
+      - name: Setup JDK 20
         uses: actions/setup-java@v3
         with:
-          java-version: 17
+          java-version: 20
           distribution: zulu
           cache: 'gradle'
 

diff --git a/.github/workflows/ci_checks.yml b/.github/workflows/ci_checks.yml
@@ -17,10 +17,10 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
-      - name: Setup JDK 17
+      - name: Setup JDK 20
         uses: actions/setup-java@v3
         with:
-          java-version: 17
+          java-version: 20
           distribution: zulu
           cache: 'gradle'
 
@@ -32,10 +32,10 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
-      - name: Setup JDK 17
+      - name: Setup JDK 20
         uses: actions/setup-java@v3
         with:
-          java-version: 17
+          java-version: 20
           distribution: zulu
           cache: 'gradle'
 
@@ -48,10 +48,10 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
-      - name: Setup JDK 17
+      - name: Setup JDK 20
         uses: actions/setup-java@v3
         with:
-          java-version: 17
+          java-version: 20
           distribution: zulu
           cache: 'gradle'
 

diff --git a/.github/workflows/ios_prod_release.yml b/.github/workflows/ios_prod_release.yml
@@ -20,10 +20,10 @@ jobs:
         with:
           input: ${{ github.event.inputs.tramline-input }}
 
-      - name: Setup JDK 17
+      - name: Setup JDK 20
         uses: actions/setup-java@v3
         with:
-          java-version: 17
+          java-version: 20
           distribution: zulu
           cache: 'gradle'
 

diff --git a/README.md b/README.md
@@ -37,7 +37,7 @@ For full list of dependencies used, please take a look at the [catalog](/gradle/
 
 You can just clone the repo and build it locally without requiring any changes. 
 
-Project requires JDK 17+, and based on the AGP version defined in [`libs.versions.toml`](/gradle/libs.versions.toml) file, 
+Project requires JDK 20+, and based on the AGP version defined in [`libs.versions.toml`](/gradle/libs.versions.toml) file, 
 you can use appropriate Android Studio to import the project.
 
 ## Contributing 🛠️

diff --git a/androidApp/build.gradle.kts b/androidApp/build.gradle.kts
@@ -24,7 +24,11 @@ plugins {
 
 sentry { tracingInstrumentation { enabled = false } }
 
-kotlin { androidTarget() }
+kotlin {
+  jvmToolchain(20)
+
+  androidTarget()
+}
 
 android {
   compileSdk = libs.versions.android.sdk.compile.get().toInt()
@@ -51,12 +55,9 @@ android {
         "1.0.0"
       }
   }
-  compileOptions {
-    sourceCompatibility = JavaVersion.VERSION_11
-    targetCompatibility = JavaVersion.VERSION_11
-    isCoreLibraryDesugaringEnabled = true
-  }
-  kotlin { jvmToolchain(11) }
+
+  compileOptions { isCoreLibraryDesugaringEnabled = true }
+
   signingConfigs {
     create("release") {
       storeFile = file("$rootDir/release/reader.jks")
@@ -65,6 +66,7 @@ android {
       keyPassword = "${project.properties["READER_KEY_PASSWORD"]}"
     }
   }
+
   buildTypes {
     release {
       isMinifyEnabled = true
@@ -75,6 +77,7 @@ android {
     }
     debug { applicationIdSuffix = ".debug" }
   }
+
   packaging {
     resources { excludes.add("/META-INF/{AL2.0,LGPL2.1}") }
 
@@ -83,6 +86,8 @@ android {
     jniLibs.excludes.add("lib/mips64/libsqlite3x.so")
     jniLibs.excludes.add("lib/armeabi/libsqlite3x.so")
   }
+
+  buildFeatures { buildConfig = true }
 }
 
 dependencies {

diff --git a/gradle.properties b/gradle.properties
@@ -11,7 +11,6 @@ kotlin.mpp.androidGradlePluginCompatibility.nowarn=true
 org.jetbrains.compose.experimental.uikit.enabled=true
 #Android
 android.useAndroidX=true
-android.defaults.buildfeatures.buildconfig=true
 android.nonTransitiveRClass=false
 android.nonFinalResIds=false
 #Sentry

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,6 +1,6 @@
 [versions]
 kotlin = "1.9.10"
-android_gradle_plugin = "8.1.2"
+android_gradle_plugin = "8.3.0-alpha09"
 compose = "1.5.10-rc01"
 compose_compiler = "1.5.2"
 

diff --git a/shared/build.gradle.kts b/shared/build.gradle.kts
@@ -41,6 +41,8 @@ buildkonfig {
 kotlin {
   targetHierarchy.default()
 
+  jvmToolchain(20)
+
   android()
 
   // spotless:off
@@ -178,11 +180,8 @@ android {
     minSdk = libs.versions.android.sdk.min.get().toInt()
     testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
   }
-  compileOptions {
-    sourceCompatibility = JavaVersion.VERSION_11
-    targetCompatibility = JavaVersion.VERSION_11
-  }
-  kotlin { jvmToolchain(11) }
+
+  @Suppress("UnstableApiUsage")
   testOptions {
     managedDevices {
       devices {