Assert Java 11 and move to Kotlin 1.8.2

Signed-off-by: Stacy Devino <[email protected]>

Author: childofthehorn

NewProjectCI/gradle/wrapper/gradle-wrapper.jar

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

NewProjectCI/gradle/wrapper/gradle-wrapper.properties

@@ -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 @@ 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##*/}
+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 @@ 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
@@ -205,6 +209,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.

NewProjectCI/gradlew

@@ -45,6 +45,11 @@ android {
         freeCompilerArgs = freeCompilerArgs + listOf(
             "-opt-in=androidx.compose.material3.ExperimentalMaterial3Api",
         )
+        jvmTarget = JavaVersion.VERSION_11.toString()
+    }
+
+    kotlin {
+        jvmToolchain(11)
     }
 
     composeOptions {

template/androidApp/build.gradle.kts

@@ -53,6 +53,10 @@ allprojects {
     dependencies {
         add("detektPlugins", "io.gitlab.arturbosch.detekt:detekt-formatting:$detektVersion")
     }
+
+    tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
+        kotlinOptions.jvmTarget = "11"
+    }
 }
 
 fun String.isNonStable(): Boolean {

template/build.gradle.kts

@@ -6,32 +6,32 @@ sdk-min = "23"
 gradle-android = "7.4.2"
 gradle-versions = "0.43.0"
 
-compose = "1.4.0"
+compose = "1.4.2"
 compose-material = "1.0.1"
-compose-compiler = "1.4.4"
+compose-compiler = "1.4.6"
 compose-navigation = "2.5.3"
 compose-navigation-hilt = "1.0.0"
-accompanist = "0.30.0"
+accompanist = "0.30.1"
 datastore = "1.0.0"
 
 lint = "25.3.0"
 detekt = "1.22.0"
 
 javax = "1"
 hilt = "2.45"
-mockk = "1.13.4"
+mockk = "1.13.5"
 hilt-testing = "2.45"
 dagger = "2.43.2"
-kotlin = "1.8.10"
-ktor = "2.2.4"
+kotlin = "1.8.20"
+ktor = "2.3.0"
 jvm = "5.4.1"
 coroutines = "1.6.4"
 
 [libraries]
 ## Android
 androidx-core = { group = "androidx.core", name = "core-ktx", version = "1.9.0" }
 androidx-lifecycle = { group = "androidx.lifecycle", name = "lifecycle-runtime-ktx", version = "2.6.1" }
-androidx-activity-compose = { group = "androidx.activity", name = "activity-compose", version = "1.7.0" }
+androidx-activity-compose = { group = "androidx.activity", name = "activity-compose", version = "1.7.1" }
 
 hilt-android = { group = "com.google.dagger", name = "hilt-android", version.ref = "hilt" }
 hilt-navigation-compose = { group = "androidx.hilt", name = "hilt-navigation-compose", version.ref = "compose-navigation-hilt" }
@@ -86,7 +86,7 @@ junit = { group = "junit", name = "junit", version = "4.13.2" }
 mockk = { group = "io.mockk", name = "mockk", version.ref = "mockk" }
 mockk-android = { group = "io.mockk", name = "mockk-android", version.ref = "mockk" }
 mockk-agent = { group = "io.mockk", name = "mockk-agent-jvm", version.ref = "mockk" }
-turbine = { group = "app.cash.turbine", name = "turbine", version = "0.12.1" }
+turbine = { group = "app.cash.turbine", name = "turbine", version = "0.12.3" }
 
 hilt-test = { group = "com.google.dagger", name = "hilt-android-testing", version.ref = "hilt-testing"}
 hilt-test-compiler = { group = "com.google.dagger", name = "hilt-android-compiler", version.ref = "hilt-testing"}

template/gradle/libs.versions.toml

@@ -1,6 +1,6 @@
-#Wed Oct 19 18:38:53 WEST 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists