Merge branch 'main' into twyatt/release-drafter

JuulLabs · Sep 8, 2022 · c4cedd3 · c4cedd3
2 parents 0bd6197 + 82f2ba1
commit c4cedd3
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 10 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -1,3 +1,3 @@
 # https://help.github.com/articles/about-codeowners/
 
-* @JuulLabs/conx-app-reviewers
+* @JuulLabs/conx-kotlin-reviewers
diff --git a/logging-android/build.gradle.kts b/logging-android/build.gradle.kts
@@ -16,7 +16,7 @@ kotlin {
     sourceSets {
         val commonMain by getting {
             dependencies {
-                api(project(":logging"))
+                api(projects.logging)
             }
         }
     }

diff --git a/logging-ktor-client/build.gradle.kts b/logging-ktor-client/build.gradle.kts
@@ -24,16 +24,16 @@ kotlin {
     sourceSets {
         val commonMain by getting {
             dependencies {
-                api(project(":logging"))
+                api(projects.logging)
                 api(libs.ktor.core)
                 api(libs.ktor.logging)
             }
         }
 
         val commonTest by getting {
             dependencies {
-                implementation(project(":logging-test"))
-                implementation(project(":test"))
+                implementation(projects.loggingTest)
+                implementation(projects.test)
                 implementation(kotlin("test-common"))
                 implementation(kotlin("test-annotations-common"))
                 implementation(libs.ktor.mock)

diff --git a/logging-test/build.gradle.kts b/logging-test/build.gradle.kts
@@ -19,7 +19,7 @@ kotlin {
     sourceSets {
         val commonMain by getting {
             dependencies {
-                api(project(":logging"))
+                api(projects.logging)
             }
         }
     }

diff --git a/logging/build.gradle.kts b/logging/build.gradle.kts
@@ -26,7 +26,7 @@ kotlin {
 
         val commonTest by getting {
             dependencies {
-                implementation(project(":logging-test"))
+                implementation(projects.loggingTest)
                 implementation(kotlin("test-common"))
                 implementation(kotlin("test-annotations-common"))
             }

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -1,4 +1,4 @@
-enableFeaturePreview("VERSION_CATALOGS")
+enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
 
 pluginManagement {
     repositories {

diff --git a/temporal/build.gradle.kts b/temporal/build.gradle.kts
@@ -40,7 +40,7 @@ kotlin {
 
         val commonTest by getting {
             dependencies {
-                implementation(project(":test"))
+                implementation(projects.test)
                 implementation(kotlin("test-common"))
                 implementation(kotlin("test-annotations-common"))
                 implementation(libs.kotlinx.coroutines.test)
@@ -49,7 +49,7 @@ kotlin {
 
         val androidMain by getting {
             dependencies {
-                implementation(project(":coroutines"))
+                implementation(projects.coroutines)
             }
         }