Bump sdk, java, AGP, gradle and libs versions (#203)

* Bump java, AGP, gradle and libs versions * Update android.yml * Add pro guard rule
alexandregpereira · Sep 8, 2023 · 89bc655 · 89bc655
1 parent 90d44b5
commit 89bc655
Show file tree

Hide file tree

Showing 28 changed files with 142 additions and 120 deletions.
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -19,10 +19,10 @@ jobs:
     steps:
     - uses: actions/[email protected]
 
-    - name: set up JDK 11
+    - name: set up JDK 17
       uses: actions/[email protected]
       with:
-        java-version: '11'
+        java-version: '17'
         distribution: 'adopt'
 
     - name: Setup Gradle

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -85,13 +85,6 @@ android {
         }
     }
 
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_11
-        targetCompatibility = JavaVersion.VERSION_11
-    }
-    kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_11.toString()
-    }
     buildFeatures {
         compose = true
     }
@@ -101,6 +94,12 @@ android {
     }
 }
 
+java {
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(17))
+    }
+}
+
 dependencies {
     implementation(project(":core:analytics"))
     implementation(project(":domain:app:data"))

diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
@@ -9,3 +9,5 @@
 -keep public class br.alexandregpereira.hunter.data.** {
     public protected *;
 }
+
+-dontwarn org.slf4j.impl.StaticLoggerBinder
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,8 +1,8 @@
 buildscript {
     extra.apply {
-        set("compileSdk", 33)
+        set("compileSdk", 34)
         set("minSdk", 24)
-        set("targetSdk", 33)
+        set("targetSdk", 34)
     }
     repositories {
         google()

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -15,7 +15,7 @@
  */
 
 plugins {
-    kotlin("jvm") version "1.8.20"
+    kotlin("jvm") version "1.9.10"
 }
 
 repositories {
@@ -26,6 +26,6 @@ repositories {
 
 dependencies {
     implementation(kotlin("gradle-plugin"))
-    implementation("com.android.tools.build:gradle:7.4.2")
+    implementation("com.android.tools.build:gradle:8.1.1")
     implementation(kotlin("compiler-embeddable"))
 }
diff --git a/buildSrc/src/main/kotlin/TargetConfig.kt b/buildSrc/src/main/kotlin/TargetConfig.kt
@@ -16,12 +16,17 @@
 
 import org.apache.tools.ant.taskdefs.condition.Os
 import org.gradle.api.Project
+import org.gradle.api.plugins.JavaPluginExtension
+import org.gradle.jvm.toolchain.JavaLanguageVersion
 import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
 import org.jetbrains.kotlin.gradle.plugin.mpp.Framework
 
 private val Project.kotlin: KotlinMultiplatformExtension
     get() = extensions.getByType(KotlinMultiplatformExtension::class.java)
 
+private val Project.java: JavaPluginExtension
+    get() = extensions.getByType(JavaPluginExtension::class.java)
+
 fun Project.isMac(): Boolean = Os.isFamily(Os.FAMILY_MAC) && !hasProperty("disableIos")
 
 fun Project.configureJvmTargets(
@@ -86,4 +91,10 @@ fun Project.configureTargets(
             }
         }
     }
+
+    java.apply {
+        toolchain.apply {
+            languageVersion.set(JavaLanguageVersion.of(17))
+        }
+    }
 }
diff --git a/feature/folder-detail/android/build.gradle b/feature/folder-detail/android/build.gradle
@@ -11,13 +11,7 @@ android {
         minSdkVersion project.findProperty('minSdk')
     }
 
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
-    }
-
     kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_11
         freeCompilerArgs += "-opt-in=kotlin.RequiresOptIn"
     }
 
@@ -30,6 +24,12 @@ android {
     }
 }
 
+java {
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(17))
+    }
+}
+
 dependencies {
     implementation project(':feature:folder-detail:state-holder')
     implementation project(':ui:core')

diff --git a/feature/folder-insert/android/build.gradle b/feature/folder-insert/android/build.gradle
@@ -11,13 +11,7 @@ android {
         minSdkVersion project.findProperty('minSdk')
     }
 
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
-    }
-
     kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_11
         freeCompilerArgs += "-opt-in=kotlin.RequiresOptIn"
     }
 
@@ -30,6 +24,12 @@ android {
     }
 }
 
+java {
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(17))
+    }
+}
+
 dependencies {
     implementation project(':feature:folder-insert:state-holder')
     implementation project(':ui:core')

diff --git a/feature/folder-list/android/build.gradle b/feature/folder-list/android/build.gradle
@@ -11,13 +11,7 @@ android {
         minSdkVersion project.findProperty('minSdk')
     }
 
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
-    }
-
     kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_11
         freeCompilerArgs += "-opt-in=kotlin.RequiresOptIn"
     }
 
@@ -30,6 +24,12 @@ android {
     }
 }
 
+java {
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(17))
+    }
+}
+
 dependencies {
     implementation project(':feature:folder-list:state-holder')
     implementation project(':ui:core')

diff --git a/feature/folder-preview/android/build.gradle b/feature/folder-preview/android/build.gradle
@@ -10,13 +10,7 @@ android {
         minSdkVersion project.findProperty('minSdk')
     }
 
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
-    }
-
     kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_11
         freeCompilerArgs += "-opt-in=kotlin.RequiresOptIn"
     }
 
@@ -30,6 +24,12 @@ android {
     namespace 'br.alexandregpereira.hunter.folder.preview'
 }
 
+java {
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(17))
+    }
+}
+
 dependencies {
     implementation project(':feature:folder-preview:state-holder')
     implementation project(':ui:core')

diff --git a/feature/monster-compendium/android/build.gradle b/feature/monster-compendium/android/build.gradle
@@ -11,12 +11,12 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
 
     kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_11
+        jvmTarget = JavaVersion.VERSION_17
         freeCompilerArgs += "-opt-in=kotlin.RequiresOptIn"
     }
 

diff --git a/feature/monster-content-manager/android/build.gradle b/feature/monster-content-manager/android/build.gradle
@@ -11,13 +11,7 @@ android {
         minSdkVersion project.findProperty('minSdk')
     }
 
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
-    }
-
     kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_11
         freeCompilerArgs += "-opt-in=kotlin.RequiresOptIn"
     }
 
@@ -30,6 +24,12 @@ android {
     }
 }
 
+java {
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(17))
+    }
+}
+
 dependencies {
     implementation project(':feature:monster-content-manager:state-holder')
     implementation project(':ui:core')

diff --git a/feature/monster-detail/android/build.gradle b/feature/monster-detail/android/build.gradle
@@ -10,13 +10,7 @@ android {
         minSdkVersion project.findProperty('minSdk')
     }
 
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
-    }
-
     kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_11
         freeCompilerArgs += "-opt-in=kotlin.RequiresOptIn"
     }
 
@@ -30,6 +24,12 @@ android {
     namespace 'br.alexandregpereira.hunter.detail'
 }
 
+java {
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(17))
+    }
+}
+
 dependencies {
     implementation project(':domain:monster:core')
     implementation project(':domain:monster-lore:core')

diff --git a/...tail/android/src/main/kotlin/br/alexandregpereira/hunter/detail/ui/MonsterDetailScreen.kt b/...tail/android/src/main/kotlin/br/alexandregpereira/hunter/detail/ui/MonsterDetailScreen.kt
@@ -89,7 +89,8 @@ fun MonsterDetailScreen(
     initialMonsterIndex: Int,
     contentPadding: PaddingValues = PaddingValues(0.dp),
     pagerState: PagerState = rememberPagerState(
-        initialPage = initialMonsterIndex
+        initialPage = initialMonsterIndex,
+        pageCount = { monsters.size }
     ),
     scrollState: LazyListState = rememberLazyListState(),
     onMonsterChanged: (monster: MonsterState) -> Unit = {},
@@ -489,7 +490,9 @@ private fun MonsterTopBarPreview() = Window {
                 reactions = listOf()
             )
         ),
-        pagerState = rememberPagerState(),
+        pagerState = rememberPagerState(
+            pageCount = { 1 }
+        ),
         firstVisibleItemIndex = { 0 },
         onOptionsClicked = {
 

diff --git a/...ter-detail/android/src/main/kotlin/br/alexandregpereira/hunter/detail/ui/MonsterImages.kt b/...ter-detail/android/src/main/kotlin/br/alexandregpereira/hunter/detail/ui/MonsterImages.kt
@@ -41,7 +41,6 @@ fun MonsterImages(
     shape: Shape,
     contentPadding: PaddingValues = PaddingValues(0.dp)
 ) = HorizontalPager(
-    pageCount = images.size,
     state = pagerState
 ) { pagePosition ->
     val image = images[pagePosition]

diff --git a/...tail/android/src/main/kotlin/br/alexandregpereira/hunter/detail/ui/MonsterTitleCompose.kt b/...tail/android/src/main/kotlin/br/alexandregpereira/hunter/detail/ui/MonsterTitleCompose.kt
@@ -46,7 +46,9 @@ import androidx.compose.foundation.pager.rememberPagerState
 fun MonsterTitleCompose(
     monsterTitleStates: List<MonsterTitleState>,
     modifier: Modifier = Modifier,
-    pagerState: PagerState = rememberPagerState(),
+    pagerState: PagerState = rememberPagerState(
+        pageCount = { monsterTitleStates.size }
+    ),
     contentPadding: PaddingValues = PaddingValues(16.dp),
     titleFontSize: MonsterTitleFontSize = MonsterTitleFontSize.LARGE,
     onOptionsClicked: () -> Unit = {}

diff --git a/...onster-detail/android/src/main/kotlin/br/alexandregpereira/hunter/detail/ui/SpellBlock.kt b/...onster-detail/android/src/main/kotlin/br/alexandregpereira/hunter/detail/ui/SpellBlock.kt
@@ -156,7 +156,6 @@ internal const val SPELLCASTING_ITEM_KEY = "spellcasting"
 @Preview
 @Composable
 private fun SpellBlockPreview() = Window {
-    val pagerState = rememberPagerState()
     val spellcastings = listOf(
         SpellcastingState(
             type = SpellcastingTypeState.SPELLCASTER,
@@ -203,6 +202,10 @@ private fun SpellBlockPreview() = Window {
         )
     )
 
+    val pagerState = rememberPagerState(
+        pageCount = { spellcastings.size }
+    )
+
     LazyColumn {
         spellBlock(
             monsters = listOf(

diff --git a/feature/monster-lore-detail/android/build.gradle b/feature/monster-lore-detail/android/build.gradle
@@ -11,13 +11,7 @@ android {
         minSdkVersion project.findProperty('minSdk')
     }
 
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
-    }
-
     kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_11
         freeCompilerArgs += "-opt-in=kotlin.RequiresOptIn"
     }
 
@@ -30,6 +24,12 @@ android {
     }
 }
 
+java {
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(17))
+    }
+}
+
 dependencies {
     implementation project(':feature:monster-lore-detail:state-holder')
     implementation project(':ui:core')

diff --git a/feature/search/android/build.gradle b/feature/search/android/build.gradle
@@ -10,13 +10,7 @@ android {
         minSdkVersion project.findProperty('minSdk')
     }
 
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
-    }
-
     kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_11
         freeCompilerArgs += "-opt-in=kotlin.RequiresOptIn"
     }
 
@@ -30,6 +24,12 @@ android {
     namespace 'br.alexandregpereira.hunter.search'
 }
 
+java {
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(17))
+    }
+}
+
 dependencies {
     implementation project(':core:analytics')
     implementation project(':domain:monster:core')