Merge branch 'main' into renovate/agp

JuulLabs · Dec 4, 2023 · 0bd7011 · 0bd7011
2 parents 1928e01 + d9fab62
commit 0bd7011
Show file tree

Hide file tree

Showing 19 changed files with 117 additions and 386 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -13,7 +13,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - uses: gradle/wrapper-validation-action@v1
-      - uses: actions/setup-java@v3
+      - uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
           java-version: '17'

diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml
@@ -13,7 +13,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - uses: gradle/wrapper-validation-action@v1
-      - uses: actions/setup-java@v3
+      - uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
           java-version: '17'

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -10,7 +10,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - uses: gradle/wrapper-validation-action@v1
-      - uses: actions/setup-java@v3
+      - uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
           java-version: '17'

diff --git a/axis/build.gradle.kts b/axis/build.gradle.kts
@@ -23,30 +23,13 @@ kotlin {
     iosArm64()
 
     sourceSets {
-        val commonMain by getting {
-            dependencies {
-                api(projects.scale)
-                api(projects.selection)
-            }
+        commonMain.dependencies {
+            api(projects.scale)
+            api(projects.selection)
         }
 
-        val commonTest by getting {
-            dependencies {
-                implementation(kotlin("test-common"))
-                implementation(kotlin("test-annotations-common"))
-            }
-        }
-
-        val jvmTest by getting {
-            dependencies {
-                implementation(kotlin("test-junit"))
-            }
-        }
-
-        val jsTest by getting {
-            dependencies {
-                implementation(kotlin("test-js"))
-            }
+        commonTest.dependencies {
+            implementation(kotlin("test"))
         }
     }
 }
diff --git a/box/build.gradle.kts b/box/build.gradle.kts
@@ -16,59 +16,25 @@ kotlin {
     iosArm64()
 
     sourceSets {
-        val commonMain by getting {
-            dependencies {
-                api(projects.axis)
-                api(projects.color)
-                api(projects.element)
-                api(projects.hierarchy)
-                api(projects.interpolate)
-                api(projects.kanvas)
-                api(projects.scale)
-                api(projects.selection)
-                api(projects.shape)
-                api(projects.time)
-            }
+        commonMain.dependencies {
+            api(projects.axis)
+            api(projects.color)
+            api(projects.element)
+            api(projects.hierarchy)
+            api(projects.interpolate)
+            api(projects.kanvas)
+            api(projects.scale)
+            api(projects.selection)
+            api(projects.shape)
+            api(projects.time)
         }
 
-        val commonTest by getting {
-            dependencies {
-                implementation(kotlin("reflect"))
-                implementation(kotlin("test-common"))
-                implementation(kotlin("test-annotations-common"))
-            }
+        androidMain.dependencies {
+            api(projects.elementView)
         }
 
-        val androidMain by getting {
-            dependencies {
-                api(projects.elementView)
-            }
-        }
-
-        val androidUnitTest by getting {
-            dependencies {
-                implementation(kotlin("test-junit"))
-                implementation(libs.androidx.test)
-                implementation(libs.robolectric)
-            }
-        }
-
-        val jvmTest by getting {
-            dependencies {
-                implementation(kotlin("test-junit"))
-            }
-        }
-
-        val jsMain by getting {
-            dependencies {
-                api(projects.elementView)
-            }
-        }
-
-        val jsTest by getting {
-            dependencies {
-                implementation(kotlin("test-js"))
-            }
+        jsMain.dependencies {
+            api(projects.elementView)
         }
     }
 }

diff --git a/color/build.gradle.kts b/color/build.gradle.kts
@@ -24,23 +24,8 @@ kotlin {
     iosArm64()
 
     sourceSets {
-        val commonTest by getting {
-            dependencies {
-                implementation(kotlin("test-common"))
-                implementation(kotlin("test-annotations-common"))
-            }
-        }
-
-        val jvmTest by getting {
-            dependencies {
-                implementation(kotlin("test-junit"))
-            }
-        }
-
-        val jsTest by getting {
-            dependencies {
-                implementation(kotlin("test-js"))
-            }
+        commonTest.dependencies {
+            implementation(kotlin("test"))
         }
     }
 }
diff --git a/compose/build.gradle.kts b/compose/build.gradle.kts
@@ -14,29 +14,23 @@ kotlin {
     explicitApi()
     jvmToolchain(libs.versions.jvm.toolchain.get().toInt())
 
-    androidTarget() { publishAllLibraryVariants() }
+    androidTarget().publishAllLibraryVariants()
     jvm("desktop")
 
     sourceSets {
-        val commonMain by getting {
-            dependencies {
-                api(projects.kanvas)
-                api(projects.element)
-                api(compose.runtime)
-                api(compose.foundation)
-                api(compose.material)
-                implementation(libs.datetime)
-            }
+        commonMain.dependencies {
+            api(projects.kanvas)
+            api(projects.element)
+            api(compose.runtime)
+            api(compose.foundation)
+            api(compose.material)
+            implementation(libs.datetime)
         }
-        val commonTest by getting {
-            dependencies {
-                implementation(kotlin("test"))
-            }
+        commonTest.dependencies {
+            implementation(kotlin("test"))
         }
-        val desktopMain by getting {
-            dependencies {
-                api(compose.preview)
-            }
+        getByName("desktopMain").dependencies {
+            api(compose.preview)
         }
     }
 }

diff --git a/element-view/build.gradle.kts b/element-view/build.gradle.kts
@@ -14,41 +14,24 @@ kotlin {
     js().browser()
 
     sourceSets {
-        val commonMain by getting {
-            dependencies {
-                api(projects.element)
-                api(libs.coroutines.core)
-            }
+        commonMain.dependencies {
+            api(projects.element)
+            api(libs.coroutines.core)
         }
 
-        val commonTest by getting {
-            dependencies {
-                implementation(kotlin("reflect"))
-                implementation(kotlin("test-common"))
-                implementation(kotlin("test-annotations-common"))
-            }
+        commonTest.dependencies {
+            implementation(kotlin("test"))
         }
 
-        val androidMain by getting {
-            dependencies {
-                implementation(libs.androidx.appcompat)
-                implementation(libs.androidx.lifecycle.runtime)
-                implementation(libs.coroutines.android)
-            }
+        androidMain.dependencies {
+            implementation(libs.androidx.appcompat)
+            implementation(libs.androidx.lifecycle.runtime)
+            implementation(libs.coroutines.android)
         }
 
-        val androidUnitTest by getting {
-            dependencies {
-                implementation(kotlin("test-junit"))
-                implementation(libs.androidx.test)
-                implementation(libs.robolectric)
-            }
-        }
-
-        val jsTest by getting {
-            dependencies {
-                implementation(kotlin("test-js"))
-            }
+        getByName("androidUnitTest").dependencies {
+            implementation(libs.androidx.test)
+            implementation(libs.robolectric)
         }
     }
 }

diff --git a/element/build.gradle.kts b/element/build.gradle.kts
@@ -23,29 +23,12 @@ kotlin {
     iosArm64()
 
     sourceSets {
-        val commonMain by getting {
-            dependencies {
-                api(projects.kanvas)
-            }
+        commonMain.dependencies {
+            api(projects.kanvas)
         }
 
-        val commonTest by getting {
-            dependencies {
-                implementation(kotlin("test-common"))
-                implementation(kotlin("test-annotations-common"))
-            }
-        }
-
-        val jvmTest by getting {
-            dependencies {
-                implementation(kotlin("test-junit"))
-            }
-        }
-
-        val jsTest by getting {
-            dependencies {
-                implementation(kotlin("test-js"))
-            }
+        commonTest.dependencies {
+            implementation(kotlin("test"))
         }
     }
 }
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/hierarchy/build.gradle.kts b/hierarchy/build.gradle.kts
@@ -23,23 +23,8 @@ kotlin {
     iosArm64()
 
     sourceSets {
-        val commonTest by getting {
-            dependencies {
-                implementation(kotlin("test-common"))
-                implementation(kotlin("test-annotations-common"))
-            }
-        }
-
-        val jvmTest by getting {
-            dependencies {
-                implementation(kotlin("test-junit"))
-            }
-        }
-
-        val jsTest by getting {
-            dependencies {
-                implementation(kotlin("test-js"))
-            }
+        commonTest.dependencies {
+            implementation(kotlin("test"))
         }
     }
 }
diff --git a/interpolate/build.gradle.kts b/interpolate/build.gradle.kts
@@ -23,31 +23,14 @@ kotlin {
     iosArm64()
 
     sourceSets {
-        val commonMain by getting {
-            dependencies {
-                api(projects.kanvas)
-                api(libs.datetime)
-                implementation(projects.time)
-            }
+        commonMain.dependencies {
+            api(projects.kanvas)
+            api(libs.datetime)
+            implementation(projects.time)
         }
 
-        val commonTest by getting {
-            dependencies {
-                implementation(kotlin("test-common"))
-                implementation(kotlin("test-annotations-common"))
-            }
-        }
-
-        val jvmTest by getting {
-            dependencies {
-                implementation(kotlin("test-junit"))
-            }
-        }
-
-        val jsTest by getting {
-            dependencies {
-                implementation(kotlin("test-js"))
-            }
+        commonTest.dependencies {
+            implementation(kotlin("test"))
         }
     }
 }