Skip to content

Commit

Permalink
TRCKR-T-18 update dependencies (#26)
Browse files Browse the repository at this point in the history
* TRCKR-T-18 update dependencies
* TRCKR-T-18 increment release version
* TRCKR-T-18 change project repositories mode
* TRCKR-T-18 update compiler testing
  • Loading branch information
dzmpr authored May 26, 2024
1 parent aa90a67 commit 67c860b
Show file tree
Hide file tree
Showing 10 changed files with 45 additions and 43 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,9 @@ fabric.properties
.idea/**/azureSettings.xml

### Kotlin ###
# Cache folder
.kotlin/

# Compiled class file
*.class

Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ More you can find at [advanced features](https://dzmpr.github.io/trckr/advanced_
1. Add KSP plugin to your module's `build.gradle.kts`:
```kotlin
plugins {
id("com.google.devtools.ksp") version "1.9.23-1.0.20"
id("com.google.devtools.ksp") version "2.0.0-1.0.21"
}
```
2. Add `Maven Central` to the repositories blocks in your project's `build.gradle.kts`:
Expand All @@ -63,8 +63,8 @@ repositories {
3. Add `trckr` dependencies:
```kotlin
dependencies {
implementation("ru.cookedapp.trckr:trckr-core:1.2.0")
ksp("ru.cookedapp.trckr:trckr-processor:1.2.0")
implementation("ru.cookedapp.trckr:trckr-core:1.2.1")
ksp("ru.cookedapp.trckr:trckr-processor:1.2.1")
}
```
4. Add KSP source path:
Expand Down
3 changes: 1 addition & 2 deletions build-logic/settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@ rootProject.name = "build-logic"

dependencyResolutionManagement {
// Configure repositories
// TODO: find mystery 'ivy' repository
repositoriesMode = RepositoriesMode.PREFER_PROJECT
repositoriesMode = RepositoriesMode.FAIL_ON_PROJECT_REPOS
repositories {
gradlePluginPortal()
}
Expand Down
9 changes: 4 additions & 5 deletions changelog.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
### Changelog
* Add [documentation](https://dzmpr.github.io/trckr/) page.
* Update Kotlin and KSP.

### Dependencies
| Dependency | Version |
|------------|:---------------:|
| Kotlin | `1.9.23` |
| KSP | `1.9.23-1.0.20` |
| Dependency | Version |
|------------|:--------------:|
| Kotlin | `2.0.0` |
| KSP | `2.0.0-1.0.21` |
8 changes: 4 additions & 4 deletions libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
[versions]
kotlin = "1.9.23"
ksp = "1.9.23-1.0.20"
kotlin = "2.0.0"
ksp = "2.0.0-1.0.21"
dokka = "1.9.20"
kotlinpoet = "1.16.0"
publishing = "0.28.0"
mockk = "1.13.10"
mockk = "1.13.11"
junit = "5.10.2"
compileTesting = "1.5.0"
compileTesting = "1.6.0"
binaryvalidator = "0.14.0"

[libraries]
Expand Down
4 changes: 1 addition & 3 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,7 @@ include("trckr-processor")
include("trckr-demo")

dependencyResolutionManagement {
// Configure repositories
// Use FAIL_ON_PROJECT_REPOS when https://youtrack.jetbrains.com/issue/KT-51379 will be fixed
repositoriesMode = RepositoriesMode.PREFER_PROJECT
repositoriesMode = RepositoriesMode.FAIL_ON_PROJECT_REPOS
repositories {
mavenCentral()
}
Expand Down
10 changes: 3 additions & 7 deletions trckr-core/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
import org.jetbrains.kotlin.gradle.dsl.JvmTarget

plugins {
alias(libs.plugins.kotlin.multiplatform)
Expand All @@ -10,8 +10,8 @@ kotlin {
applyDefaultHierarchyTemplate()
// JVM target
jvm {
compilations.all {
kotlinOptions.jvmTarget = "1.8"
compilerOptions {
jvmTarget = JvmTarget.JVM_1_8
}
testRuns["test"].executionTask.configure {
useJUnitPlatform()
Expand Down Expand Up @@ -52,7 +52,3 @@ kotlin {
}
}
}

tasks.withType<KotlinCompile> {
kotlinOptions.jvmTarget = "1.8"
}
16 changes: 9 additions & 7 deletions trckr-demo/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,24 +1,26 @@
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
import org.jetbrains.kotlin.gradle.dsl.JvmTarget

plugins {
alias(libs.plugins.kotlin.jvm)
alias(libs.plugins.ksp)
}

dependencies {
implementation(project(":trckr-core"))
ksp(project(":trckr-processor"))
implementation(projects.trckrCore)
ksp(projects.trckrProcessor)
}

kotlin {
compilerOptions {
jvmTarget = JvmTarget.JVM_1_8
}
}

java {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}

tasks.withType<KotlinCompile>().configureEach {
kotlinOptions.jvmTarget = "1.8"
}

sourceSets.configureEach {
kotlin.srcDir(layout.buildDirectory.dir("/generated/ksp/$name/kotlin/"))
}
27 changes: 16 additions & 11 deletions trckr-processor/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
import org.jetbrains.kotlin.gradle.dsl.JvmTarget

plugins {
alias(libs.plugins.kotlin.multiplatform)
id("trckr-artifact")
}

kotlin {
jvm {
compilations.all {
kotlinOptions {
jvmTarget = "1.8"
freeCompilerArgs += "-opt-in=ru.cookedapp.trckr.core.annotations.internal.TrckrInternal"
}
compilerOptions {
jvmTarget = JvmTarget.JVM_1_8
freeCompilerArgs.add("-opt-in=ru.cookedapp.trckr.core.annotations.internal.TrckrInternal")
}
testRuns["test"].executionTask.configure {
useJUnitPlatform()
Expand All @@ -18,15 +18,20 @@ kotlin {

sourceSets {
jvmMain.dependencies {
implementation(project(":trckr-core"))
implementation(projects.trckrCore)
implementation(libs.ksp.api)
implementation(libs.bundles.kotlinpoet)
}
jvmTest.dependencies {
implementation(libs.kotlin.test)
implementation(libs.junit)
implementation(libs.mockk)
implementation(libs.bundles.compile.testing)
jvmTest {
compilerOptions {
freeCompilerArgs.add("-opt-in=org.jetbrains.kotlin.compiler.plugin.ExperimentalCompilerApi")
}
dependencies {
implementation(libs.kotlin.test)
implementation(libs.junit)
implementation(libs.mockk)
implementation(libs.bundles.compile.testing)
}
}
}
}
2 changes: 1 addition & 1 deletion trckr.version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.2.0
1.2.1

0 comments on commit 67c860b

Please sign in to comment.