From bce6ed81d33273ef73379ff31b65272726ff2856 Mon Sep 17 00:00:00 2001 From: Eliezer Graber Date: Sun, 30 Jul 2023 18:13:53 -0400 Subject: [PATCH] Update conventions to 0.0.44 --- build.gradle.kts | 4 ++-- gradle/libs.versions.toml | 4 +--- settings.gradle.kts | 3 +-- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 7b6caa3..8a055ce 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,4 +1,5 @@ import com.eygraber.conventions.tasks.deleteRootBuildDirWhenCleaning +import org.jetbrains.kotlin.gradle.dsl.JvmTarget buildscript { dependencies { @@ -33,7 +34,6 @@ gradleConventionsDefaults { } kotlin { - jdkVersion = libs.versions.jdk.get() - jvmDistribution = JvmVendorSpec.AZUL + jvmTargetVersion = JvmTarget.JVM_11 } } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index abd8404..6c01f36 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -7,15 +7,13 @@ android-sdk-compile = "33" android-sdk-min = "21" android-sdk-target = "33" -conventions = "0.0.39" +conventions = "0.0.44" detekt = "1.23.1" detektEygraber = "1.0.11" dokka = "1.8.20" -jdk = "11" - kotlin = "1.9.0" ktlint = "0.50.0" diff --git a/settings.gradle.kts b/settings.gradle.kts index cacd16c..faad0a2 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -52,9 +52,8 @@ dependencyResolutionManagement { } plugins { - id("com.eygraber.conventions.settings") version "0.0.39" + id("com.eygraber.conventions.settings") version "0.0.44" id("com.gradle.enterprise") version "3.14.1" - id("org.gradle.toolchains.foojay-resolver-convention") version("0.6.0") } rootProject.name = "uri-kmp"