A fully functional Android app built entirely with Kotlin and Jetpack Compose
Update to AGP 8.0
Alex Vanyo086dc957c067
diff --git a/.github/workflows/AndroidCIWithGmd.yaml b/.github/workflows/AndroidCIWithGmd.yamlindex 44f8141f6..1c1206ed4 100644--- a/.github/workflows/AndroidCIWithGmd.yaml+++ b/.github/workflows/AndroidCIWithGmd.yaml@@ -18,7 +18,7 @@ jobs:- uses: actions/setup-java@v3with:distribution: 'zulu'- java-version: '11'+ java-version: 17- uses: actions/checkout@v3- name: Setup Android SDKdiff --git a/.github/workflows/Build.yaml b/.github/workflows/Build.yamlindex 342714245..c15daea80 100644--- a/.github/workflows/Build.yaml+++ b/.github/workflows/Build.yaml@@ -24,11 +24,11 @@ jobs:- name: Copy CI gradle.propertiesrun: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties- - name: Set up JDK 11+ - name: Set up JDK 17uses: actions/setup-java@v3with:distribution: 'zulu'- java-version: 11+ java-version: 17- name: Setup Gradleuses: gradle/gradle-build-action@v2@@ -73,11 +73,11 @@ jobs:- name: Copy CI gradle.propertiesrun: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties- - name: Set up JDK 11+ - name: Set up JDK 17uses: actions/setup-java@v3with:distribution: 'zulu'- java-version: 11+ java-version: 17- name: Setup Gradleuses: gradle/gradle-build-action@v2diff --git a/.github/workflows/Release.yml b/.github/workflows/Release.ymlindex 86f88a920..534e9d893 100644--- a/.github/workflows/Release.yml+++ b/.github/workflows/Release.yml@@ -20,11 +20,11 @@ jobs:- name: Copy CI gradle.propertiesrun: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties- - name: Set up JDK 11+ - name: Set up JDK 17uses: actions/setup-java@v3with:distribution: 'zulu'- java-version: 11+ java-version: 17- name: Build apprun: ./gradlew :app:assembleDemoReleasediff --git a/build-logic/convention/build.gradle.kts b/build-logic/convention/build.gradle.ktsindex 281434b87..5408b218a 100644--- a/build-logic/convention/build.gradle.kts+++ b/build-logic/convention/build.gradle.kts@@ -14,6 +14,8 @@* limitations under the License.*/+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile+plugins {`kotlin-dsl`}@@ -25,6 +27,12 @@ java {targetCompatibility = JavaVersion.VERSION_11}+tasks.withType<KotlinCompile>().configureEach {+ kotlinOptions {+ jvmTarget = JavaVersion.VERSION_11.toString()+ }+}+dependencies {compileOnly(libs.android.gradlePlugin)compileOnly(libs.firebase.crashlytics.gradle)diff --git a/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/AndroidCompose.kt b/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/AndroidCompose.ktindex 4da997fc3..cdcc65a7f 100644--- a/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/AndroidCompose.kt+++ b/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/AndroidCompose.kt@@ -17,10 +17,14 @@package com.google.samples.apps.nowinandroidimport com.android.build.api.dsl.CommonExtension+import org.gradle.api.JavaVersionimport org.gradle.api.Projectimport org.gradle.api.artifacts.VersionCatalogsExtensionimport org.gradle.kotlin.dsl.dependenciesimport org.gradle.kotlin.dsl.getByType+import org.gradle.kotlin.dsl.provideDelegate+import org.gradle.kotlin.dsl.withType+import org.jetbrains.kotlin.gradle.tasks.KotlinCompileimport java.io.File/**@@ -40,16 +44,18 @@ internal fun Project.configureAndroidCompose(kotlinCompilerExtensionVersion = libs.findVersion("androidxComposeCompiler").get().toString()}- kotlinOptions {- freeCompilerArgs = freeCompilerArgs + buildComposeMetricsParameters()- }-dependencies {val bom = libs.findLibrary("androidx-compose-bom").get()add("implementation", platform(bom))add("androidTestImplementation", platform(bom))}}++ tasks.withType<KotlinCompile>().configureEach {+ kotlinOptions {+ freeCompilerArgs = freeCompilerArgs + buildComposeMetricsParameters()+ }+ }}private fun Project.buildComposeMetricsParameters(): List<String> {diff --git a/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/KotlinAndroid.kt b/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/KotlinAndroid.ktindex da0cab531..bf510a2c4 100644--- a/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/KotlinAndroid.kt+++ b/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/KotlinAndroid.kt@@ -24,7 +24,9 @@ import org.gradle.api.plugins.ExtensionAwareimport org.gradle.kotlin.dsl.dependenciesimport org.gradle.kotlin.dsl.getByTypeimport org.gradle.kotlin.dsl.provideDelegate+import org.gradle.kotlin.dsl.withTypeimport org.jetbrains.kotlin.gradle.dsl.KotlinJvmOptions+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile/*** Configure base Kotlin with Android options@@ -44,13 +46,17 @@ internal fun Project.configureKotlinAndroid(targetCompatibility = JavaVersion.VERSION_11isCoreLibraryDesugaringEnabled = true}+ }+ // Use withType to workaround https://youtrack.jetbrains.com/issue/KT-55947+ tasks.withType<KotlinCompile>().configureEach {kotlinOptions {+ // Set JVM target to 11+ jvmTarget = JavaVersion.VERSION_11.toString()// Treat all Kotlin warnings as errors (disabled by default)// Override by setting warningsAsErrors=true in your ~/.gradle/gradle.propertiesval warningsAsErrors: String? by projectallWarningsAsErrors = warningsAsErrors.toBoolean()-freeCompilerArgs = freeCompilerArgs + listOf("-opt-in=kotlin.RequiresOptIn",// Enable experimental coroutines APIs, including Flow@@ -58,9 +64,6 @@ internal fun Project.configureKotlinAndroid("-opt-in=kotlinx.coroutines.FlowPreview","-opt-in=kotlin.Experimental",)-- // Set JVM target to 11- jvmTarget = JavaVersion.VERSION_11.toString()}}@@ -70,7 +73,3 @@ internal fun Project.configureKotlinAndroid(add("coreLibraryDesugaring", libs.findLibrary("android.desugarJdkLibs").get())}}--fun CommonExtension<*, *, *, *>.kotlinOptions(block: KotlinJvmOptions.() -> Unit) {- (this as ExtensionAware).extensions.configure("kotlinOptions", block)-}diff --git a/core/datastore/build.gradle.kts b/core/datastore/build.gradle.ktsindex 1787a5b8f..59a3a8e32 100644--- a/core/datastore/build.gradle.kts+++ b/core/datastore/build.gradle.kts@@ -14,11 +14,6 @@* limitations under the License.*/-import com.google.protobuf.gradle.builtins-import com.google.protobuf.gradle.generateProtoTasks-import com.google.protobuf.gradle.protobuf-import com.google.protobuf.gradle.protoc-// TODO: Remove once https://youtrack.jetbrains.com/issue/KTIJ-19369 is fixed@Suppress("DSL_SCOPE_VIOLATION")plugins {diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.tomlindex 677438412..08af52b65 100644--- a/gradle/libs.versions.toml+++ b/gradle/libs.versions.toml@@ -1,7 +1,7 @@[versions]accompanist = "0.28.0"androidDesugarJdkLibs = "1.2.2"-androidGradlePlugin = "7.4.1"+androidGradlePlugin = "8.0.0"androidxActivity = "1.7.0"androidxAppCompat = "1.5.1"androidxBrowser = "1.4.0"@@ -45,7 +45,7 @@ ksp = "1.8.0-1.0.9"lint = "30.3.1"okhttp = "4.10.0"protobuf = "3.21.12"-protobufPlugin = "0.8.19"+protobufPlugin = "0.9.1"retrofit = "2.9.0"retrofitKotlinxSerializationJson = "0.8.0"room = "2.5.0"diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jarindex 249e5832f..943f0cbfa 100644Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differdiff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.propertiesindex 070cb702f..0c85a1f75 100644--- a/gradle/wrapper/gradle-wrapper.properties+++ b/gradle/wrapper/gradle-wrapper.properties@@ -1,5 +1,6 @@distributionBase=GRADLE_USER_HOMEdistributionPath=wrapper/dists-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip+networkTimeout=10000zipStoreBase=GRADLE_USER_HOMEzipStorePath=wrapper/distsdiff --git a/gradlew b/gradlewindex a69d9cb6c..65dcd68d6 100755--- a/gradlew+++ b/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,10 +80,10 @@ doesacdone-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit--APP_NAME="Gradle"+# This is normally unused+# shellcheck disable=SC2034APP_BASE_NAME=${0##*/}+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit# 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"'@@ -143,12 +143,16 @@ fiif ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; thencase $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=SC3045MAX_FD=$( ulimit -H -n ) ||warn "Could not query maximum file descriptor limit"esaccase $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=SC3045ulimit -n "$MAX_FD" ||warn "Could not set maximum file descriptor limit to $MAX_FD"esacdiff --git a/gradlew.bat b/gradlew.batindex 53a6b238d..6689b85be 100644--- a/gradlew.bat+++ b/gradlew.bat@@ -26,6 +26,7 @@ if "%OS%"=="Windows_NT" setlocalset DIRNAME=%~dp0if "%DIRNAME%"=="" set DIRNAME=.+@rem This is normally unusedset APP_BASE_NAME=%~n0set APP_HOME=%DIRNAME%diff --git a/kokoro/build.sh b/kokoro/build.shindex 5c50a814f..2036d1e07 100755--- a/kokoro/build.sh+++ b/kokoro/build.sh@@ -36,7 +36,7 @@ echo y | ${ANDROID_HOME}/tools/bin/sdkmanager --licensescd $KOKORO_ARTIFACTS_DIR/git/nowinandroid# The build needs Java 11, set it as the default Java version.-sudo update-java-alternatives --set java-1.11.0-openjdk-amd64+sudo update-java-alternatives --set java-1.17.0-openjdk-amd64# Also clear JAVA_HOME variable so java -version is used insteadexport JAVA_HOME=diff --git a/lint/build.gradle.kts b/lint/build.gradle.ktsindex bbf24126d..08ab9bec4 100644--- a/lint/build.gradle.kts+++ b/lint/build.gradle.kts@@ -13,6 +13,9 @@* See the License for the specific language governing permissions and* limitations under the License.*/++import org.jetbrains.kotlin.gradle.tasks.KotlinCompile+plugins {`java-library`kotlin("jvm")@@ -24,6 +27,12 @@ java {targetCompatibility = JavaVersion.VERSION_11}+tasks.withType<KotlinCompile>().configureEach {+ kotlinOptions {+ jvmTarget = JavaVersion.VERSION_11.toString()+ }+}+dependencies {compileOnly(libs.kotlin.stdlib)compileOnly(libs.lint.api)