Merge pull request #17 from dzmpr/feat/TRCKR-T-11_update_ksp

TRCKR-MR-11 update ksp
dzmpr · Jun 9, 2023 · 1a8e23f · 1a8e23f
2 parents aadb78f + 4ed1cd1
commit 1a8e23f
Show file tree

Hide file tree

Showing 12 changed files with 23 additions and 31 deletions.
diff --git a/README.md b/README.md
@@ -43,7 +43,7 @@ flowchart TD;
 1. Add KSP plugin to your module's `build.gradle.kts`:
 ```kotlin
 plugins {
-    id("com.google.devtools.ksp") version "1.8.21-1.0.11"
+    id("com.google.devtools.ksp") version "1.8.22-1.0.11"
 }
 ```
 2. Add `Maven Central` to the repositories blocks in your project's `build.gradle.kts`:
@@ -55,8 +55,8 @@ repositories {
 3. Add `trckr` dependencies:
 ```kotlin
 dependencies {
-    implementation("ru.cookedapp.trckr:trckr-core:1.1.1")
-    ksp("ru.cookedapp.trckr:trckr-processor:1.1.1")
+    implementation("ru.cookedapp.trckr:trckr-core:1.1.2")
+    ksp("ru.cookedapp.trckr:trckr-processor:1.1.2")
 }
 ```
 4. Add KSP source path:

diff --git a/build-logic/build.gradle.kts b/build-logic/build.gradle.kts
@@ -2,10 +2,6 @@ plugins {
     `kotlin-dsl`
 }
 
-repositories {
-    gradlePluginPortal()
-}
-
 dependencies {
     implementation(libs.publishing.plugin)
 }
diff --git a/build-logic/settings.gradle.kts b/build-logic/settings.gradle.kts
@@ -1,4 +1,11 @@
 dependencyResolutionManagement {
+    // Configure repositories
+    // TODO: find mystery 'ivy' repository
+    repositoriesMode.set(RepositoriesMode.PREFER_PROJECT)
+    repositories {
+        gradlePluginPortal()
+    }
+    // Configure version catalog
     versionCatalogs {
         create("libs") {
             from(files("../libs.versions.toml"))

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,4 +1,3 @@
-@Suppress("DSL_SCOPE_VIOLATION")
 plugins {
     alias(libs.plugins.ksp) apply false
     alias(libs.plugins.kotlin.jvm) apply false
@@ -13,9 +12,3 @@ apiValidation {
     }
     nonPublicMarkers.add("ru.cookedapp.trckr.core.annotations.internal.TrckrInternal")
 }
-
-allprojects {
-    repositories {
-        mavenCentral()
-    }
-}
diff --git a/changelog.md b/changelog.md
@@ -1,8 +1,8 @@
 ### Changelog
-* Update project dependencies.
+* Update Kotlin and KSP.
 
 ### Dependencies
 | Dependency |     Version     |
 |------------|:---------------:|
-| Kotlin     |    `1.8.21`     |
-| KSP        | `1.8.21-1.0.11` |
+| Kotlin     |    `1.8.22`     |
+| KSP        | `1.8.22-1.0.11` |
diff --git a/libs.versions.toml b/libs.versions.toml
@@ -1,6 +1,6 @@
 [versions]
-kotlin = "1.8.21"
-ksp = "1.8.21-1.0.11"
+kotlin = "1.8.22"
+ksp = "1.8.22-1.0.11"
 kotlinpoet = "1.13.2"
 publishing = "0.25.2"
 mockk = "1.13.5"

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -1,4 +1,3 @@
-
 rootProject.name = "trckr"
 
 includeBuild("build-logic")
@@ -7,6 +6,13 @@ include("trckr-processor")
 include("trckr-demo")
 
 dependencyResolutionManagement {
+    // Configure repositories
+    // TODO: find mystery 'ivy' repository
+    repositoriesMode.set(RepositoriesMode.PREFER_PROJECT)
+    repositories {
+        mavenCentral()
+    }
+    // Configure version catalog
     versionCatalogs {
         create("libs") {
             from(files("./libs.versions.toml"))

diff --git a/trckr-core/build.gradle.kts b/trckr-core/build.gradle.kts
@@ -1,6 +1,5 @@
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
-@Suppress("DSL_SCOPE_VIOLATION")
 plugins {
     alias(libs.plugins.kotlin.multiplatform)
     id("trckr-artifact")

diff --git a/trckr-core/src/test/kotlin/ru/cookedapp/trckr/core/TestFakes.kt b/trckr-core/src/test/kotlin/ru/cookedapp/trckr/core/TestFakes.kt
diff --git a/trckr-demo/build.gradle.kts b/trckr-demo/build.gradle.kts
@@ -1,6 +1,5 @@
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
-@Suppress("DSL_SCOPE_VIOLATION")
 plugins {
     alias(libs.plugins.kotlin.jvm)
     alias(libs.plugins.ksp)

diff --git a/trckr-processor/build.gradle.kts b/trckr-processor/build.gradle.kts
@@ -1,4 +1,3 @@
-@Suppress("DSL_SCOPE_VIOLATION")
 plugins {
     alias(libs.plugins.kotlin.multiplatform)
     id("trckr-artifact")

diff --git a/trckr.version b/trckr.version
@@ -1 +1 @@
-1.1.1
+1.1.2