(misc) misc updates

Signed-off-by: androidacy-user <opensource@androidacy.com>
master
androidacy-user 1 year ago
parent d0ad060039
commit 54b42dfa8c

@ -408,7 +408,9 @@ android {
kotlin {
jvmToolchain(17)
jvmToolchain {
languageVersion.set(JavaLanguageVersion.of(17))
}
}
java {

@ -16,7 +16,7 @@ buildscript {
dependencies {
classpath("com.android.tools.build:gradle:8.1.0-beta01")
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.20")
classpath("com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin:10.6.1")
classpath("com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin:10.6.2")
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
@ -35,3 +35,10 @@ afterEvaluate {
targetCompatibility = JavaVersion.VERSION_17.toString()
}
}
val service = project.extensions.getByType<JavaToolchainService>()
val customLauncher = service.launcherFor {
languageVersion.set(JavaLanguageVersion.of(17))
}5
project.tasks.withType<UsesKotlinJavaToolchain>().configureEach {
kotlinJavaToolchain.toolchain.use(customLauncher)
}

Binary file not shown.

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

5
gradlew vendored

@ -130,14 +130,11 @@ location of your Java installation."
fi
else
JAVACMD=java
if ! command -v java >/dev/null 2>&1
then
die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
fi
# Increase the maximum file descriptors if we can.
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then

Loading…
Cancel
Save