Uppdated AGP to 8.1.1

.github/workflows/build.yml

@@ -20,7 +20,7 @@ jobs:
       - uses: actions/setup-java@v3
         with:
           distribution: 'zulu'
-          java-version: '11'
+          java-version: '17'
       - uses: gradle/wrapper-validation-action@v1
       - uses: gradle/gradle-build-action@v2
         with:
@@ -81,7 +81,7 @@ jobs:
       - uses: actions/setup-java@v3
         with:
           distribution: 'zulu'
-          java-version: '11'
+          java-version: '17'
       - uses: gradle/wrapper-validation-action@v1
       - uses: gradle/gradle-build-action@v2
         with:
@@ -146,7 +146,7 @@ jobs:
       - uses: actions/setup-java@v3
         with:
           distribution: 'zulu'
-          java-version: '11'
+          java-version: '17'
       - uses: gradle/wrapper-validation-action@v1
       - uses: gradle/gradle-build-action@v2
         with:

.github/workflows/release.yml

@@ -14,7 +14,7 @@ jobs:
       - uses: actions/setup-java@v3
         with:
           distribution: 'zulu'
-          java-version: '11'
+          java-version: '17'
       - uses: gradle/wrapper-validation-action@v1
       - uses: gradle/gradle-build-action@v2
         env:

appyx-components/experimental/cards/common/src/androidMain/AndroidManifest.xml

@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="com.bumble.appyx.components.experimental.cards" />
+<manifest />

appyx-components/experimental/modal/common/src/androidMain/AndroidManifest.xml

@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="com.bumble.appyx.components.experimental.modal" />
+<manifest />

appyx-components/experimental/promoter/common/src/androidMain/AndroidManifest.xml

@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="com.bumble.appyx.components.experimental.promoter" />
+<manifest />

appyx-components/experimental/puzzle15/common/src/androidMain/AndroidManifest.xml

@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="com.bumble.appyx.components.experimental.puzzle15" />
+<manifest />

appyx-components/internal/test-drive/android/src/androidTest/AndroidManifest.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.bumble.appyx.components.internal.testdrive.android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application android:theme="@android:style/Theme.Material.NoActionBar" />
 

appyx-components/internal/test-drive/common/src/androidMain/AndroidManifest.xml

@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="com.bumble.appyx.components.internal.testdrive" />
+<manifest />

appyx-components/stable/backstack/common/src/androidMain/AndroidManifest.xml

@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="com.bumble.appyx.components.backstack" />
+<manifest />

appyx-components/stable/spotlight/android/src/androidTest/AndroidManifest.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.bumble.appyx.components.spotlight.android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application android:theme="@android:style/Theme.Material.NoActionBar" />
 

appyx-components/stable/spotlight/common/src/androidMain/AndroidManifest.xml

@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="com.bumble.appyx.components.spotlight" />
+<manifest />

appyx-interactions/common/src/androidMain/AndroidManifest.xml

@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="com.bumble.appyx.interactions" />
+<manifest />

demos/common/src/androidMain/AndroidManifest.xml

@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="com.bumble.appyx.samples.common" />
+<manifest />

gradle.properties

@@ -1,3 +1,6 @@
+android.defaults.buildfeatures.buildconfig=true
+android.nonFinalResIds=false
+android.nonTransitiveRClass=false
 android.useAndroidX=true
 kotlin.code.style=official
 kotlin.mpp.androidSourceSetLayoutVersion1.nowarn=true

gradle/libs.versions.toml

@@ -2,7 +2,7 @@
 
 [versions]
 accompanist = "0.28.0"
-agp = "7.4.1"
+agp = "8.1.1"
 androidCompileSdk = "33"
 androidMinSdk = "21"
 androidTargetSdk = "32"
@@ -16,7 +16,7 @@ coroutines = "1.6.4"
 dependencyAnalysis = "1.13.1"
 detekt = "1.21.0"
 junit5 = "5.8.2"
-jvmTarget = "11"
+jvmTarget = "17"
 kotlin = "1.8.10"
 ksp = "1.8.0-1.0.8"
 mvicore = "1.2.6"
@@ -87,7 +87,7 @@ junit-vintage = { module = "org.junit.vintage:junit-vintage-engine", version.ref
 
 plugin-kotlin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
 plugin-detekt = { module = "io.gitlab.arturbosch.detekt:detekt-gradle-plugin", version.ref = "detekt" }
-plugin-android = "com.android.tools.build:gradle:7.4.0"
+plugin-android = { module = "com.android.tools.build:gradle", version.ref = "agp" }
 
 detekt-compose = "com.twitter.compose.rules:detekt:0.0.26"
 toolargetool = "com.gu.android:toolargetool:0.3.0"

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,13 +80,10 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -143,12 +140,16 @@ fi
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -193,6 +194,10 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
 # Collect all arguments for the java command;
 #   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
 #     shell script including quotes and variable substitutions, so put them in
@@ -205,6 +210,12 @@ set -- \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.

gradlew.bat

@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,8 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal

plugins/convention/build.gradle.kts

@@ -11,10 +11,6 @@ dependencies {
     implementation(project(":publish-plugin"))
 }
 
-tasks.withType(org.jetbrains.kotlin.gradle.dsl.KotlinJvmCompile::class.java).configureEach {
-    kotlinOptions.jvmTarget = JavaVersion.VERSION_11.name
-}
-
 detekt {
     buildUponDefaultConfig = true
     config.from(file("../../detekt.yml"))

plugins/convention/src/main/kotlin/com/bumble/appyx/android/AndroidCommonConfiguration.kt

@@ -4,14 +4,15 @@ import com.android.build.api.dsl.CommonExtension
 import com.android.build.api.dsl.DefaultConfig
 import com.android.build.api.variant.AndroidComponentsExtension
 import com.bumble.appyx.versionCatalog
+import org.gradle.api.JavaVersion
 import org.gradle.api.Project
 import org.gradle.api.artifacts.VersionCatalog
 import org.gradle.api.artifacts.VersionCatalogsExtension
 import org.gradle.kotlin.dsl.getByType
 
 internal inline fun <
         reified ConfigT : DefaultConfig,
-        reified DslExtensionT : CommonExtension<*, *, ConfigT, *>,
+        reified DslExtensionT : CommonExtension<*, *, ConfigT, *, *>,
         reified ComponentsExtensionT : AndroidComponentsExtension<DslExtensionT, *, *>
         > Project.applyAndroidPlugin(
     androidPluginId: String,
@@ -45,7 +46,7 @@ internal inline fun <
         }
 }
 
-private fun <DefaultConfigT : DefaultConfig> CommonExtension<*, *, DefaultConfigT, *>.configure(
+private fun <DefaultConfigT : DefaultConfig> CommonExtension<*, *, DefaultConfigT, *, *>.configure(
     appyxExtension: AndroidConventionExtension,
     libs: VersionCatalog,
 ) {
@@ -84,4 +85,9 @@ private fun <DefaultConfigT : DefaultConfig> CommonExtension<*, *, DefaultConfig
             add("META-INF/LICENSE-notice.md")
         }
     }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
 }

plugins/convention/src/main/kotlin/com/bumble/appyx/multiplatform/MultiplatformConventionPlugin.kt

@@ -3,6 +3,7 @@ package com.bumble.appyx.multiplatform
 import com.android.build.api.variant.LibraryAndroidComponentsExtension
 import com.bumble.appyx.versionCatalog
 import io.gitlab.arturbosch.detekt.extensions.DetektExtension
+import org.gradle.api.JavaVersion
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.api.artifacts.VersionCatalogsExtension
@@ -46,6 +47,11 @@ class MultiplatformConventionPlugin : Plugin<Project> {
                             minSdk = libs.findVersion("androidMinSdk").get().displayName.toInt()
                             targetSdk = libs.findVersion("androidTargetSdk").get().displayName.toInt()
                         }
+
+                        compileOptions {
+                            sourceCompatibility = JavaVersion.VERSION_17
+                            targetCompatibility = JavaVersion.VERSION_17
+                        }
                     }
                 }
         }

plugins/publish-plugin/build.gradle.kts

@@ -9,10 +9,6 @@ dependencies {
     implementation(libs.plugin.kotlin)
 }
 
-tasks.withType(org.jetbrains.kotlin.gradle.dsl.KotlinJvmCompile::class.java).configureEach {
-    kotlinOptions.jvmTarget = JavaVersion.VERSION_11.name
-}
-
 detekt {
     buildUponDefaultConfig = true
     config.from(file("../../detekt.yml"))

plugins/screenshot-tests/build.gradle.kts

@@ -8,10 +8,6 @@ dependencies {
     implementation(libs.plugin.android)
 }
 
-tasks.withType(org.jetbrains.kotlin.gradle.dsl.KotlinJvmCompile::class.java).configureEach {
-    kotlinOptions.jvmTarget = JavaVersion.VERSION_11.name
-}
-
 detekt {
     buildUponDefaultConfig = true
     config.from(file("../../detekt.yml"))

plugins/verification-plugin/build.gradle.kts

@@ -9,10 +9,6 @@ dependencies {
     implementation(libs.plugin.detekt)
 }
 
-tasks.withType(org.jetbrains.kotlin.gradle.dsl.KotlinJvmCompile::class.java).configureEach {
-    kotlinOptions.jvmTarget = JavaVersion.VERSION_11.name
-}
-
 detekt {
     buildUponDefaultConfig = true
     config.from(file("../../detekt.yml"))

plugins/verification-plugin/src/main/kotlin/LintPlugin.kt

@@ -16,7 +16,7 @@ class LintPlugin : Plugin<Project> {
     }
 
     private fun collectLintSarif(target: Project) {
-        target.extensions.configure<CommonExtension<*, *, *, *>>("android") {
+        target.extensions.configure<CommonExtension<*, *, *, *, *>>("android") {
             lint {
                 sarifReport = true
                 baseline = target.file("lint-baseline.xml")

settings.gradle.kts

@@ -24,8 +24,6 @@ dependencyResolutionManagement {
     }
 }
 
-enableFeaturePreview("VERSION_CATALOGS")
-
 include(
     ":appyx-components:stable:backstack:android",
     ":appyx-components:stable:backstack:common",