From 67689829b5187792adf3f24be4475c8bfc9de73a Mon Sep 17 00:00:00 2001 From: Alexandre G Pereira Date: Fri, 8 Sep 2023 16:15:06 -0300 Subject: [PATCH 1/3] Bump java, AGP, gradle and libs versions --- app/build.gradle.kts | 13 +++++----- build.gradle.kts | 4 +-- buildSrc/build.gradle.kts | 4 +-- buildSrc/src/main/kotlin/TargetConfig.kt | 11 ++++++++ feature/folder-detail/android/build.gradle | 12 ++++----- feature/folder-insert/android/build.gradle | 12 ++++----- feature/folder-list/android/build.gradle | 12 ++++----- feature/folder-preview/android/build.gradle | 12 ++++----- .../monster-compendium/android/build.gradle | 6 ++--- .../android/build.gradle | 12 ++++----- feature/monster-detail/android/build.gradle | 12 ++++----- .../hunter/detail/ui/MonsterDetailScreen.kt | 7 +++-- .../hunter/detail/ui/MonsterImages.kt | 1 - .../hunter/detail/ui/MonsterTitleCompose.kt | 4 ++- .../hunter/detail/ui/SpellBlock.kt | 5 +++- .../monster-lore-detail/android/build.gradle | 12 ++++----- feature/search/android/build.gradle | 12 ++++----- feature/settings/android/build.gradle | 12 ++++----- feature/spell-detail/android/build.gradle | 12 ++++----- feature/sync/android/build.gradle | 12 ++++----- gradle.properties | 5 +++- gradle/libs.versions.toml | 26 +++++++++---------- gradle/wrapper/gradle-wrapper.properties | 2 +- ui/compendium/build.gradle | 12 ++++----- ui/core/build.gradle | 12 ++++----- ui/monster-compendium/build.gradle | 12 ++++----- 26 files changed, 138 insertions(+), 118 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 5c21d50a..d3e802ef 100644 --- 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/build.gradle.kts b/build.gradle.kts index e6c43ed4..4504d705 100644 --- 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 index d334ef24..bfac4ddb 100644 --- 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 index 097938c8..096ce149 100644 --- 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 index 8a32bd1e..e93bcfe4 100644 --- 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 index c6910543..ba2537f3 100644 --- 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 index f04b839b..72353cc5 100644 --- 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 index 1759e1ec..d83de758 100644 --- 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 index bd69c39d..88abd266 100644 --- 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 index 92e89292..30d383a1 100644 --- 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 index 2dbf1237..64ec507b 100644 --- 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/feature/monster-detail/android/src/main/kotlin/br/alexandregpereira/hunter/detail/ui/MonsterDetailScreen.kt b/feature/monster-detail/android/src/main/kotlin/br/alexandregpereira/hunter/detail/ui/MonsterDetailScreen.kt index 16b787fb..47266719 100644 --- a/feature/monster-detail/android/src/main/kotlin/br/alexandregpereira/hunter/detail/ui/MonsterDetailScreen.kt +++ b/feature/monster-detail/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/feature/monster-detail/android/src/main/kotlin/br/alexandregpereira/hunter/detail/ui/MonsterImages.kt b/feature/monster-detail/android/src/main/kotlin/br/alexandregpereira/hunter/detail/ui/MonsterImages.kt index f0afb902..0c75ad1f 100644 --- a/feature/monster-detail/android/src/main/kotlin/br/alexandregpereira/hunter/detail/ui/MonsterImages.kt +++ b/feature/monster-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/feature/monster-detail/android/src/main/kotlin/br/alexandregpereira/hunter/detail/ui/MonsterTitleCompose.kt b/feature/monster-detail/android/src/main/kotlin/br/alexandregpereira/hunter/detail/ui/MonsterTitleCompose.kt index 0b7b2fba..cbbd50f2 100644 --- a/feature/monster-detail/android/src/main/kotlin/br/alexandregpereira/hunter/detail/ui/MonsterTitleCompose.kt +++ b/feature/monster-detail/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, 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/feature/monster-detail/android/src/main/kotlin/br/alexandregpereira/hunter/detail/ui/SpellBlock.kt b/feature/monster-detail/android/src/main/kotlin/br/alexandregpereira/hunter/detail/ui/SpellBlock.kt index 9e1ed11a..e21ad102 100644 --- a/feature/monster-detail/android/src/main/kotlin/br/alexandregpereira/hunter/detail/ui/SpellBlock.kt +++ b/feature/monster-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 index 6217046d..a8389f9c 100644 --- 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 index 42adf46f..213def51 100644 --- 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') diff --git a/feature/settings/android/build.gradle b/feature/settings/android/build.gradle index 7f56612a..24e43853 100644 --- a/feature/settings/android/build.gradle +++ b/feature/settings/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.settings' } +java { + toolchain { + languageVersion.set(JavaLanguageVersion.of(17)) + } +} + dependencies { implementation project(':core:analytics') implementation project(':domain:settings:core') diff --git a/feature/spell-detail/android/build.gradle b/feature/spell-detail/android/build.gradle index d1927616..c0f86c3a 100644 --- a/feature/spell-detail/android/build.gradle +++ b/feature/spell-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.spell.detail' } +java { + toolchain { + languageVersion.set(JavaLanguageVersion.of(17)) + } +} + dependencies { implementation project(':core:analytics') implementation project(':domain:spell:core') diff --git a/feature/sync/android/build.gradle b/feature/sync/android/build.gradle index 9be4a71a..c3de3c64 100644 --- a/feature/sync/android/build.gradle +++ b/feature/sync/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:sync:state-holder') implementation project(':ui:core') diff --git a/gradle.properties b/gradle.properties index f4ed2ccf..e4d421b1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -32,7 +32,10 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 # https://developer.android.com/topic/libraries/support-library/androidx-rn android.useAndroidX=true kotlin.code.style=official -android.compileSdk=33 +android.compileSdk=34 android.minSdk=24 xcodeproj=iosApp/MonsterCompendium.xcodeproj kotlin.mpp.androidSourceSetLayoutVersion=2 +android.defaults.buildfeatures.buildconfig=true +android.nonTransitiveRClass=false +android.nonFinalResIds=false diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 3123e5a6..7beae776 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,30 +1,30 @@ [versions] accompanist = "0.30.1" -android_gradle_plugin = "7.4.2" +android_gradle_plugin = "8.1.1" appcompat = "1.6.1" arch_core_testing = "2.2.0" coil_compose = "2.4.0" -compose_activity = '1.7.0' -compose = '1.5.0-alpha03' -compose_material = '1.5.0-alpha03' -compose_compiler = '1.4.6' -core_ktx = '1.9.0' -espresso_core = "3.4.0" -firebase_bom = "32.2.0" +compose_activity = '1.7.2' +compose = '1.5.1' +compose_material = '1.5.1' +compose_compiler = '1.5.3' +core_ktx = '1.12.0' +espresso_core = "3.5.1" +firebase_bom = "32.2.3" googleplay_services = "4.3.15" -gradle_firebase_crashlytics = "2.9.7" -junit_ext = "1.1.3" +gradle_firebase_crashlytics = "2.9.9" +junit_ext = "1.1.5" junit = "4.13.2" koin = '3.4.1' koin_compose = '3.4.5' -kotlin = '1.8.20' +kotlin = '1.9.10' kotlin_coroutines_test = '1.7.2' kotlin_coroutines = '1.7.2' kotlin_datetime = '0.4.0' kotlinx_serialization = "1.5.1" ktor = "2.3.2" -lifecycle = "2.6.1" -material = "1.8.0" +lifecycle = "2.6.2" +material = "1.9.0" mockk = "1.13.5" multiplatform-settings = "1.0.0" okhttp3_logging_interceptor = "4.11.0" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 8ddfcf55..ba1931f4 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -16,6 +16,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/ui/compendium/build.gradle b/ui/compendium/build.gradle index 1e014ba9..fe647a56 100644 --- a/ui/compendium/build.gradle +++ b/ui/compendium/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(':ui:core') diff --git a/ui/core/build.gradle b/ui/core/build.gradle index f02706f2..6e2d1f0e 100644 --- a/ui/core/build.gradle +++ b/ui/core/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.ui' } +java { + toolchain { + languageVersion.set(JavaLanguageVersion.of(17)) + } +} + dependencies { implementation libs.core.ktx diff --git a/ui/monster-compendium/build.gradle b/ui/monster-compendium/build.gradle index 22e5b892..8acaac4e 100644 --- a/ui/monster-compendium/build.gradle +++ b/ui/monster-compendium/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 { api project(':ui:compendium') implementation project(':ui:core') From d2c9ab71a056b4f893aa012e1454127f7466b614 Mon Sep 17 00:00:00 2001 From: Alexandre G Pereira Date: Fri, 8 Sep 2023 18:03:14 -0300 Subject: [PATCH 2/3] Update android.yml --- .github/workflows/android.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 957710e5..8c587a07 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -19,10 +19,10 @@ jobs: steps: - uses: actions/checkout@v2.5.0 - - name: set up JDK 11 + - name: set up JDK 17 uses: actions/setup-java@v3.6.0 with: - java-version: '11' + java-version: '17' distribution: 'adopt' - name: Setup Gradle From f98c4b1b75f98e9868500dc824bf43ac75cb8a64 Mon Sep 17 00:00:00 2001 From: Alexandre G Pereira Date: Fri, 8 Sep 2023 18:19:47 -0300 Subject: [PATCH 3/3] Add pro guard rule --- app/proguard-rules.pro | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index f68a0a88..26ca702e 100644 --- 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