Update gradle-conventions to 0.0.64

eygraber · Jan 5, 2024 · b7d96e2
1 parent 66efb5a
commit b7d96e2
Show file tree

Hide file tree

Showing 8 changed files with 40 additions and 925 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -25,3 +25,17 @@ gradleConventionsDefaults {
  explicitApiMode = ExplicitApiMode.Strict
  }
 }
+
+gradleConventionsKmpDefaults {
+ targets(
+ KmpTarget.AndroidNative,
+ KmpTarget.Ios,
+ KmpTarget.Js,
+ KmpTarget.Jvm,
+ KmpTarget.Linux,
+ KmpTarget.Macos,
+ KmpTarget.Mingw,
+ KmpTarget.Tvos,
+ KmpTarget.Watchos,
+ )
+}
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-conventions = "0.0.58"
+conventions = "0.0.64"
 
 detekt = "1.23.4"
 

diff --git a/jsonpath-benchmarks/build.gradle.kts b/jsonpath-benchmarks/build.gradle.kts
@@ -7,20 +7,15 @@ plugins {
 }
 
 kotlin {
-
  kmpTargets(
+ KmpTarget.Js,
+ KmpTarget.Jvm,
+ KmpTarget.Linux,
+ KmpTarget.Macos,
+ KmpTarget.Mingw,
  project = project,
- android = false,
- androidNative = false,
- jvm = true,
- ios = false,
- macos = true,
- linux = true,
- mingw = true,
- wasmJs = false,
- wasmWasi = false,
- js = true,
  binaryType = BinaryType.Executable,
+ ignoreDefaultTargets = true,
  )
 
  jvm {

diff --git a/jsonpath-core/build.gradle.kts b/jsonpath-core/build.gradle.kts
@@ -6,21 +6,8 @@ plugins {
 }
 
 kotlin {
- kmpTargets(
+ defaultKmpTargets(
  project = project,
- android = false,
- androidNative = true,
- jvm = true,
- ios = true,
- tvos = true,
- watchos = true,
- macos = true,
- linux = true,
- mingw = true,
- wasmJs = false,
- wasmWasi = false,
- js = true,
- jsBrowser = false,
  )
 
  sourceSets {

diff --git a/jsonpath-kotlinx/build.gradle.kts b/jsonpath-kotlinx/build.gradle.kts
@@ -5,21 +5,8 @@ plugins {
 }
 
 kotlin {
- kmpTargets(
+ defaultKmpTargets(
  project = project,
- android = false,
- androidNative = true,
- jvm = true,
- ios = true,
- macos = true,
- tvos = true,
- watchos = true,
- linux = true,
- mingw = true,
- wasmJs = false,
- wasmWasi = false,
- js = true,
- jsBrowser = false,
  )
 
  sourceSets {

diff --git a/jsonpath-test/build.gradle.kts b/jsonpath-test/build.gradle.kts
@@ -6,21 +6,8 @@ plugins {
 }
 
 kotlin {
- kmpTargets(
+ defaultKmpTargets(
  project = project,
- android = false,
- androidNative = true,
- jvm = true,
- ios = true,
- macos = true,
- tvos = true,
- watchos = true,