Merge pull request #46 from childofthehorn/coth-update-apr23

sdsantos · web-flow · commit 92c498854aae · 2023-05-08T10:14:05.000+01:00
Updating Android App dependencies to latest for AS Electric Eel
diff --git a/NewProjectCI/build.gradle.kts b/NewProjectCI/build.gradle.kts
@@ -1,7 +1,7 @@
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
-    kotlin("jvm") version "1.7.10"
+    kotlin("jvm") version "1.8.20"
     application
 }
 
@@ -17,7 +17,7 @@ repositories {
 }
 
 dependencies {
-    implementation("com.github.ajalt.clikt:clikt:3.5.0")
+    implementation("com.github.ajalt.clikt:clikt:3.5.2")
     implementation("me.tongfei:progressbar:0.9.5")
     implementation("org.lucee:commons-io:2.6.0")
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4")
@@ -30,7 +30,7 @@ tasks.test {
 }
 
 tasks.withType<KotlinCompile> {
-    kotlinOptions.jvmTarget = "1.8"
+    kotlinOptions.jvmTarget = "11"
 }
 
 
diff --git a/NewProjectCI/gradle/wrapper/gradle-wrapper.jar b/NewProjectCI/gradle/wrapper/gradle-wrapper.jar
diff --git a/NewProjectCI/gradle/wrapper/gradle-wrapper.properties b/NewProjectCI/gradle/wrapper/gradle-wrapper.properties
@@ -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
diff --git a/NewProjectCI/gradlew b/NewProjectCI/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 @@ 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.
diff --git a/template/androidApp/build.gradle.kts b/template/androidApp/build.gradle.kts
@@ -33,8 +33,8 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
     }
 
     hilt { enableAggregatingTask = true }
@@ -47,6 +47,10 @@ android {
         )
     }
 
+    kotlin {
+        jvmToolchain(11)
+    }
+
     composeOptions {
         kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get().toString()
     }
diff --git a/template/build-logic/convention/build.gradle.kts b/template/build-logic/convention/build.gradle.kts
@@ -5,8 +5,8 @@ plugins {
 group = "io.bloco.template.buildlogic"
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
+    sourceCompatibility = JavaVersion.VERSION_11
+    targetCompatibility = JavaVersion.VERSION_11
 }
 
 dependencies {
diff --git a/template/build-logic/convention/src/main/kotlin/CoroutinesConventionPlugin.kt b/template/build-logic/convention/src/main/kotlin/CoroutinesConventionPlugin.kt
@@ -24,7 +24,7 @@ class CoroutinesConventionPlugin: Plugin<Project> {
                 "-opt-in=kotlin.Experimental",
             )
 
-            jvmTarget = JavaVersion.VERSION_1_8.toString()
+            jvmTarget = JavaVersion.VERSION_11.toString()
         }
 
         dependencies {
diff --git a/template/build-logic/convention/src/main/kotlin/KotlinFeatureConventionPlugin.kt b/template/build-logic/convention/src/main/kotlin/KotlinFeatureConventionPlugin.kt
@@ -19,8 +19,8 @@ class KotlinFeatureConventionPlugin : Plugin<Project> {
             }
 
             extensions.configure<JavaPluginExtension> {
-                sourceCompatibility = JavaVersion.VERSION_1_8
-                targetCompatibility = JavaVersion.VERSION_1_8
+                sourceCompatibility = JavaVersion.VERSION_11
+                targetCompatibility = JavaVersion.VERSION_11
             }
 
             dependencies {
diff --git a/template/build-logic/gradle/wrapper/gradle-wrapper.properties b/template/build-logic/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/template/build.gradle.kts b/template/build.gradle.kts
@@ -14,7 +14,7 @@ buildscript {
     dependencies {
         @Suppress("GradleDynamicVersion")
         classpath("com.github.ben-manes:gradle-versions-plugin:+")
-        classpath("org.jlleitschuh.gradle:ktlint-gradle:11.0.0")
+        classpath("org.jlleitschuh.gradle:ktlint-gradle:11.3.1")
     }
 }
 
@@ -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 {
diff --git a/template/gradle/libs.versions.toml b/template/gradle/libs.versions.toml
@@ -3,35 +3,35 @@ sdk-compile = "33"
 sdk-target = "33"
 sdk-min = "23"
 
-gradle-android = "7.3.1"
+gradle-android = "7.4.2"
 gradle-versions = "0.43.0"
 
-compose = "1.3.2"
+compose = "1.4.2"
 compose-material = "1.0.1"
-compose-compiler = "1.3.2"
+compose-compiler = "1.4.6"
 compose-navigation = "2.5.3"
 compose-navigation-hilt = "1.0.0"
-accompanist = "0.28.0"
+accompanist = "0.30.1"
 datastore = "1.0.0"
 
-lint = "30.3.1"
+lint = "25.3.0"
 detekt = "1.22.0"
 
 javax = "1"
-hilt = "2.44.2"
-mockk = "1.13.3"
-hilt-testing = "2.44"
+hilt = "2.45"
+mockk = "1.13.5"
+hilt-testing = "2.45"
 dagger = "2.43.2"
-kotlin = "1.7.20"
-ktor = "2.2.1"
+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.5.1" }
-androidx-activity-compose = { group = "androidx.activity", name = "activity-compose", version = "1.6.1" }
+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.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" }
@@ -62,8 +62,8 @@ compose-tools-manifest = { group = "androidx.compose.ui", name = "ui-test-manife
 
 # Testing
 test-core = { group = "androidx.test", name = "core", version = "1.5.0" }
-test-junit = { group = "androidx.test.ext", name = "junit", version = "1.1.4" }
-test-espresso = { group = "androidx.test.espresso", name = "espresso-core", version = "3.5.0" }
+test-junit = { group = "androidx.test.ext", name = "junit", version = "1.1.5" }
+test-espresso = { group = "androidx.test.espresso", name = "espresso-core", version = "3.5.1" }
 test-compose = { group = "androidx.compose.ui", name = "ui-test-junit4", version.ref = "compose" }
 test-navigation = { group = "androidx.navigation", name = "navigation-testing", version.ref = "compose-navigation" }
 
@@ -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"}
@@ -157,5 +157,5 @@ jvm = { id = "java-library", version.ref = "jvm" }
 kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
 kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
-ktlint = { id = "org.jlleitschuh.gradle.ktlint", version = "11.0.0" }
+ktlint = { id = "org.jlleitschuh.gradle.ktlint", version = "11.3.1" }
 detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt" }
diff --git a/template/gradle/wrapper/gradle-wrapper.jar b/template/gradle/wrapper/gradle-wrapper.jar
diff --git a/template/gradle/wrapper/gradle-wrapper.properties b/template/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Oct 19 18:38:53 WEST 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-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
diff --git a/template/gradlew b/template/gradlew
diff --git a/template/lint-checks/build.gradle.kts b/template/lint-checks/build.gradle.kts

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`import org.jetbrains.kotlin.gradle.tasks.KotlinCompile`
`2`	`2`
`3`	`3`	`plugins {`
`4`		`- kotlin("jvm") version "1.7.10"`
	`4`	`+ kotlin("jvm") version "1.8.20"`
`5`	`5`	`application`
`6`	`6`	`}`
`7`	`7`
`@@ -17,7 +17,7 @@ repositories {`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`dependencies {`
`20`		`- implementation("com.github.ajalt.clikt:clikt:3.5.0")`
	`20`	`+ implementation("com.github.ajalt.clikt:clikt:3.5.2")`
`21`	`21`	`implementation("me.tongfei:progressbar:0.9.5")`
`22`	`22`	`implementation("org.lucee:commons-io:2.6.0")`
`23`	`23`	`implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4")`
`@@ -30,7 +30,7 @@ tasks.test {`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`tasks.withType<KotlinCompile> {`
`33`		`- kotlinOptions.jvmTarget = "1.8"`
	`33`	`+ kotlinOptions.jvmTarget = "11"`
`34`	`34`	`}`
`35`	`35`
`36`	`36`
Original file line number	Diff line number	Diff line change
`@@ -33,8 +33,8 @@ android {`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`compileOptions {`
`36`		`- sourceCompatibility = JavaVersion.VERSION_1_8`
`37`		`- targetCompatibility = JavaVersion.VERSION_1_8`
	`36`	`+ sourceCompatibility = JavaVersion.VERSION_11`
	`37`	`+ targetCompatibility = JavaVersion.VERSION_11`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`hilt { enableAggregatingTask = true }`
`@@ -47,6 +47,10 @@ android {`
`47`	`47`	`)`
`48`	`48`	`}`
`49`	`49`
	`50`	`+ kotlin {`
	`51`	`+ jvmToolchain(11)`
	`52`	`+ }`
	`53`	`+`
`50`	`54`	`composeOptions {`
`51`	`55`	`kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get().toString()`
`52`	`56`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,8 +5,8 @@ plugins {`
`5`	`5`	`group = "io.bloco.template.buildlogic"`
`6`	`6`
`7`	`7`	`java {`
`8`		`- sourceCompatibility = JavaVersion.VERSION_1_8`
`9`		`- targetCompatibility = JavaVersion.VERSION_1_8`
	`8`	`+ sourceCompatibility = JavaVersion.VERSION_11`
	`9`	`+ targetCompatibility = JavaVersion.VERSION_11`
`10`	`10`	`}`
`11`	`11`
`12`	`12`	`dependencies {`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ class CoroutinesConventionPlugin: Plugin<Project> {`
`24`	`24`	`"-opt-in=kotlin.Experimental",`
`25`	`25`	`)`
`26`	`26`
`27`		`- jvmTarget = JavaVersion.VERSION_1_8.toString()`
	`27`	`+ jvmTarget = JavaVersion.VERSION_11.toString()`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`dependencies {`
Original file line number	Diff line number	Diff line change
`@@ -19,8 +19,8 @@ class KotlinFeatureConventionPlugin : Plugin<Project> {`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`extensions.configure<JavaPluginExtension> {`
`22`		`- sourceCompatibility = JavaVersion.VERSION_1_8`
`23`		`- targetCompatibility = JavaVersion.VERSION_1_8`
	`22`	`+ sourceCompatibility = JavaVersion.VERSION_11`
	`23`	`+ targetCompatibility = JavaVersion.VERSION_11`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`dependencies {`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ buildscript {`
`14`	`14`	`dependencies {`
`15`	`15`	`@Suppress("GradleDynamicVersion")`
`16`	`16`	`classpath("com.github.ben-manes:gradle-versions-plugin:+")`
`17`		`- classpath("org.jlleitschuh.gradle:ktlint-gradle:11.0.0")`
	`17`	`+ classpath("org.jlleitschuh.gradle:ktlint-gradle:11.3.1")`
`18`	`18`	`}`
`19`	`19`	`}`
`20`	`20`
`@@ -53,6 +53,10 @@ allprojects {`
`53`	`53`	`dependencies {`
`54`	`54`	`add("detektPlugins", "io.gitlab.arturbosch.detekt:detekt-formatting:$detektVersion")`
`55`	`55`	`}`
	`56`	`+`
	`57`	`+ tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {`
	`58`	`+ kotlinOptions.jvmTarget = "11"`
	`59`	`+ }`
`56`	`60`	`}`
`57`	`61`
`58`	`62`	`fun String.isNonStable(): Boolean {`