From ffcb7b319c9f9f52601beb374d6cf2c9479166fe Mon Sep 17 00:00:00 2001
From: Eliezer Graber <me@eygraber.com>
Date: Fri, 5 Jan 2024 02:56:35 -0500
Subject: [PATCH] Update gradle conventions to 0.0.61

---
 .github/workflows/pr.yml  |  2 +-
 build.gradle.kts          |  2 ++
 gradle/libs.versions.toml |  2 +-
 renovate.json             |  5 +++++
 settings.gradle.kts       |  2 +-
 uri/build.gradle.kts      | 21 ++++++---------------
 6 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index 1d3fda1..14e2547 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -35,7 +35,7 @@ jobs:
           gradle-version: wrapper
 
       - name: Run checks
-        run: ./format --no-format && ./gradlew check detektAppleMain detektJvmMain detektJsWasmMain detektMetadataMain -x wasmBrowserTest -x wasmNodeTest
+        run: ./format --no-format && ./gradlew check detektAppleMain detektJvmMain detektCommonJsMain detektMetadataMain -x wasmBrowserTest -x wasmNodeTest
 
   checkWindows:
     runs-on: windows-latest
diff --git a/build.gradle.kts b/build.gradle.kts
index 8a055ce..bdd75aa 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.ExplicitApiMode
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 buildscript {
@@ -35,5 +36,6 @@ gradleConventionsDefaults {
 
   kotlin {
     jvmTargetVersion = JvmTarget.JVM_11
+    explicitApiMode = ExplicitApiMode.Strict
   }
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index f1e2c2f..595dfd0 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -7,7 +7,7 @@ android-sdk-compile = "33"
 android-sdk-min = "21"
 android-sdk-target = "33"
 
-conventions = "0.0.58"
+conventions = "0.0.61"
 
 detekt = "1.23.4"
 detektEygraber = "1.0.11"
diff --git a/renovate.json b/renovate.json
index 0ae2ce5..a74b3ae 100644
--- a/renovate.json
+++ b/renovate.json
@@ -6,6 +6,11 @@
   "labels": ["dependencies"],
   "prHourlyLimit": 3,
   "packageRules": [
+    {
+      "groupName": "gradle-conventions",
+      "matchPackagePrefixes": ["com.eygraber.conventions"],
+      "automerge": true
+    },
     {
       "matchDatasources": ["maven"],
       "depType": "dependencies",
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 03c8b29..be374af 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -52,7 +52,7 @@ dependencyResolutionManagement {
 }
 
 plugins {
-  id("com.eygraber.conventions.settings") version "0.0.58"
+  id("com.eygraber.conventions.settings") version "0.0.61"
   id("com.gradle.enterprise") version "3.16.1"
 }
 
diff --git a/uri/build.gradle.kts b/uri/build.gradle.kts
index 7a8c8e6..2b65dcf 100644
--- a/uri/build.gradle.kts
+++ b/uri/build.gradle.kts
@@ -12,22 +12,13 @@ android {
 }
 
 kotlin {
-  explicitApi()
-
-  kmpTargets(
+  allKmpTargets(
     project = project,
-    android = true,
-    androidNative = true,
-    jvm = true,
-    ios = true,
-    macos = true,
-    tvos = true,
-    watchos = true,
-    linux = true,
-    mingw = true,
-    wasmJs = true,
-    wasmWasi = true,
-    js = true
+    webOptions = KmpTarget.WebOptions(
+      isNodeEnabled = true,
+      isBrowserEnabled = true,
+      isLibraryBrowserTestsEnabled = true,
+    ),
   )
 
   sourceSets {