diff --git a/build-logic/src/main/kotlin/dev/msfjarvis/claw/gradle/DependencyUpdatesPlugin.kt b/build-logic/src/main/kotlin/dev/msfjarvis/claw/gradle/DependencyUpdatesPlugin.kt index 8962a1c8..f5971feb 100644 --- a/build-logic/src/main/kotlin/dev/msfjarvis/claw/gradle/DependencyUpdatesPlugin.kt +++ b/build-logic/src/main/kotlin/dev/msfjarvis/claw/gradle/DependencyUpdatesPlugin.kt @@ -39,7 +39,7 @@ class DependencyUpdatesPlugin : Plugin { } private fun isNonStable(version: String): Boolean { - val stableKeyword = listOf("RELEASE", "FINAL", "GA").any { version.toUpperCase().contains(it) } + val stableKeyword = listOf("RELEASE", "FINAL", "GA").any { version.uppercase().contains(it) } val regex = "^[0-9,.v-]+(-r)?$".toRegex() val isStable = stableKeyword || regex.matches(version) return isStable.not() diff --git a/build-logic/src/main/kotlin/dev/msfjarvis/claw/gradle/RenameArtifactsPlugin.kt b/build-logic/src/main/kotlin/dev/msfjarvis/claw/gradle/RenameArtifactsPlugin.kt index e6218774..f8587abb 100644 --- a/build-logic/src/main/kotlin/dev/msfjarvis/claw/gradle/RenameArtifactsPlugin.kt +++ b/build-logic/src/main/kotlin/dev/msfjarvis/claw/gradle/RenameArtifactsPlugin.kt @@ -11,7 +11,6 @@ import com.android.build.api.variant.ApplicationAndroidComponentsExtension import com.android.build.api.variant.VariantOutputConfiguration import dev.msfjarvis.claw.gradle.artifacts.CollectApksTask import dev.msfjarvis.claw.gradle.artifacts.CollectBundleTask -import java.util.Locale import org.gradle.api.Plugin import org.gradle.api.Project import org.gradle.kotlin.dsl.configure @@ -24,7 +23,7 @@ class RenameArtifactsPlugin : Plugin { project.pluginManager.withPlugin("com.android.application") { project.extensions.configure { onVariants { variant -> - val taskPrefix = "collect${variant.name.capitalize(Locale.ROOT)}" + val taskPrefix = "collect${variant.name.replaceFirstChar { it.uppercase() }}" project.tasks.register("${taskPrefix}Apks") { variantName.set(variant.name) apkFolder.set(variant.artifacts.get(SingleArtifact.APK)) diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 943f0cbf..ccebba77 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index adb6acbd..15248c81 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=7ba68c54029790ab444b39d7e293d3236b2632631fb5f2e012bb28b4ff669e4b -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip +distributionSha256Sum=d5bb29e784426547e4f455fbc0e6512d7a6a67d7d890cf24d601309287128b79 +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-rc-1-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 65dcd68d..79a61d42 100755 --- a/gradlew +++ b/gradlew @@ -144,7 +144,7 @@ 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 + # shellcheck disable=SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac @@ -152,7 +152,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then '' | soft) :;; #( *) # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 + # shellcheck disable=SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac diff --git a/settings.gradle.kts b/settings.gradle.kts index 7647f3e0..0534ac15 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -139,5 +139,4 @@ include( "database", "metadata-extractor", "model", - "sync-backend", )