aboutsummaryrefslogtreecommitdiffstats
path: root/build-logic
diff options
context:
space:
mode:
Diffstat (limited to 'build-logic')
-rw-r--r--build-logic/build.gradle.kts1
-rw-r--r--build-logic/settings.gradle.kts4
-rw-r--r--build-logic/src/main/kotlin/app/passwordstore/gradle/KotlinCommonPlugin.kt2
3 files changed, 0 insertions, 7 deletions
diff --git a/build-logic/build.gradle.kts b/build-logic/build.gradle.kts
index 4be841d2..2bb5b6ea 100644
--- a/build-logic/build.gradle.kts
+++ b/build-logic/build.gradle.kts
@@ -80,7 +80,6 @@ dependencies {
implementation(libs.build.moshi)
implementation(libs.build.moshi.kotlin)
implementation(libs.build.okhttp)
- implementation(libs.build.r8)
implementation(libs.build.semver)
implementation(libs.build.sentry)
implementation(libs.build.spotless)
diff --git a/build-logic/settings.gradle.kts b/build-logic/settings.gradle.kts
index 5a6bcc14..1488630b 100644
--- a/build-logic/settings.gradle.kts
+++ b/build-logic/settings.gradle.kts
@@ -24,10 +24,6 @@ dependencyResolutionManagement {
includeModule("me.tylerbwong.gradle.metalava", "plugin")
}
}
- exclusiveContent {
- forRepository { maven("https://storage.googleapis.com/r8-releases/raw") }
- filter { includeModule("com.android.tools", "r8") }
- }
mavenCentral { mavenContent { releasesOnly() } }
}
versionCatalogs {
diff --git a/build-logic/src/main/kotlin/app/passwordstore/gradle/KotlinCommonPlugin.kt b/build-logic/src/main/kotlin/app/passwordstore/gradle/KotlinCommonPlugin.kt
index 2e22781b..f84edcb2 100644
--- a/build-logic/src/main/kotlin/app/passwordstore/gradle/KotlinCommonPlugin.kt
+++ b/build-logic/src/main/kotlin/app/passwordstore/gradle/KotlinCommonPlugin.kt
@@ -13,7 +13,6 @@ import org.gradle.api.tasks.testing.logging.TestLogEvent
import org.gradle.jvm.toolchain.JavaLanguageVersion
import org.gradle.jvm.toolchain.JavaToolchainSpec
import org.gradle.kotlin.dsl.withType
-import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
@Suppress("Unused")
@@ -25,7 +24,6 @@ class KotlinCommonPlugin : Plugin<Project> {
withType<KotlinCompile>().configureEach task@{
compilerOptions {
allWarningsAsErrors.set(project.providers.environmentVariable("CI").isPresent)
- languageVersion.set(KotlinVersion.KOTLIN_1_9)
freeCompilerArgs.addAll(ADDITIONAL_COMPILER_ARGS)
if (!this@task.name.contains("test", ignoreCase = true) && !isAppModule) {
freeCompilerArgs.add("-Xexplicit-api=strict")