diff --git a/.github/workflows/build_check.yml b/.github/workflows/build_check.yml index 61ac4d925..fbb058775 100644 --- a/.github/workflows/build_check.yml +++ b/.github/workflows/build_check.yml @@ -26,10 +26,10 @@ jobs: - name: Clone repo uses: actions/checkout@v3 - - name: Set up JDK 11 + - name: Set up JDK uses: actions/setup-java@v3 with: - java-version: 11 + java-version: 17 distribution: adopt - name: Build app diff --git a/.github/workflows/build_push.yml b/.github/workflows/build_push.yml index 03b79b4ff..bab3cd936 100644 --- a/.github/workflows/build_push.yml +++ b/.github/workflows/build_push.yml @@ -20,10 +20,10 @@ jobs: - name: Validate Gradle Wrapper uses: gradle/wrapper-validation-action@v1 - - name: Set up JDK 11 + - name: Set up JDK uses: actions/setup-java@v3 with: - java-version: 11 + java-version: 17 distribution: adopt # SY <-- diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 88b4ec650..0ffaf51b3 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -99,7 +99,7 @@ android { } } - packagingOptions { + packaging { resources.excludes.addAll(listOf( "META-INF/DEPENDENCIES", "LICENSE.txt", diff --git a/app/proguard-android-optimize.txt b/app/proguard-android-optimize.txt index ad490a86c..7514e28c2 100644 --- a/app/proguard-android-optimize.txt +++ b/app/proguard-android-optimize.txt @@ -1,5 +1,6 @@ -allowaccessmodification -dontusemixedcaseclassnames +-ignorewarnings -verbose -keepattributes *Annotation* diff --git a/build.gradle.kts b/build.gradle.kts index 22a17ae3a..c1f58f347 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -21,7 +21,7 @@ plugins { subprojects { tasks.withType { kotlinOptions { - jvmTarget = JavaVersion.VERSION_1_8.toString() + jvmTarget = JavaVersion.VERSION_17.toString() } } @@ -45,8 +45,8 @@ subprojects { } compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 isCoreLibraryDesugaringEnabled = true } diff --git a/gradle.properties b/gradle.properties index 5eaad3635..b12e724a7 100755 --- a/gradle.properties +++ b/gradle.properties @@ -20,7 +20,9 @@ org.gradle.parallel=true org.gradle.caching=true -# AndroidX support -android.useAndroidX=true +kotlin.mpp.androidSourceSetLayoutVersion=2 -kotlin.mpp.androidSourceSetLayoutVersion=2 \ No newline at end of file +android.useAndroidX=true +android.defaults.buildfeatures.buildconfig=true +android.nonTransitiveRClass=false +android.nonFinalResIds=false diff --git a/gradle/androidx.versions.toml b/gradle/androidx.versions.toml index b65ef08b1..f31d5413f 100644 --- a/gradle/androidx.versions.toml +++ b/gradle/androidx.versions.toml @@ -1,5 +1,5 @@ [versions] -agp_version = "7.4.2" +agp_version = "8.0.0" lifecycle_version = "2.6.1" [libraries]