Skip to content

Commit

Permalink
Update dependencies (#21)
Browse files Browse the repository at this point in the history
* TRCKR-T-16 update gradle
* TRCKR-T-16 update kotlin, ksp and other dependencies
* TRCKR-T-16 update readme
  • Loading branch information
dzmpr authored Nov 28, 2023
1 parent 4c018c3 commit c9501cf
Show file tree
Hide file tree
Showing 13 changed files with 66 additions and 49 deletions.
3 changes: 2 additions & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
root = true

[*]
end_of_line = lf
insert_final_newline = true
indent_style = space
max_line_length = 120

[*.{kt,kts}]
indent_size = 4
ij_any_blank_lines_after_class_header = 1
ij_continuation_indent_size = 4
ij_kotlin_allow_trailing_comma = true
ij_kotlin_allow_trailing_comma_on_call_site = true
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.9.0-1.0.12"
id("com.google.devtools.ksp") version "1.9.21-1.0.15"
}
```
2. Add `Maven Central` to the repositories blocks in your project's `build.gradle.kts`:
Expand All @@ -55,8 +55,8 @@ repositories {
3. Add `trckr` dependencies:
```kotlin
dependencies {
implementation("ru.cookedapp.trckr:trckr-core:1.1.3")
ksp("ru.cookedapp.trckr:trckr-processor:1.1.3")
implementation("ru.cookedapp.trckr:trckr-core:1.1.5")
ksp("ru.cookedapp.trckr:trckr-processor:1.1.5")
}
```
4. Add KSP source path:
Expand All @@ -66,7 +66,7 @@ To access generated code from KSP, you need to set up the source path into your
kotlin {
// ...
sourceSets.configureEach {
kotlin.srcDir("$buildDir/generated/ksp/$name/kotlin/")
kotlin.srcDir(layout.buildDirectory.dir("/generated/ksp/$name/kotlin/"))
}
}
```
Expand Down
4 changes: 2 additions & 2 deletions changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@
### Dependencies
| Dependency | Version |
|------------|:---------------:|
| Kotlin | `1.9.10` |
| KSP | `1.9.10-1.0.13` |
| Kotlin | `1.9.21` |
| KSP | `1.9.21-1.0.15` |
7 changes: 6 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1 +1,6 @@
kotlin.code.style=official
# Gradle
org.gradle.jvmargs=-Xmx4g -XX:+HeapDumpOnOutOfMemoryError -XX:+UseParallelGC -Dkotlin.daemon.jvm.options=-XX:MaxMetaspaceSize=1g
org.gradle.configureondemand=true
org.gradle.parallel=true
org.gradle.daemon=true
org.gradle.configuration-cache=true
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
30 changes: 22 additions & 8 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
# Darwin, MinGW, and NonStop.
#
# (3) This script is generated from the Groovy template
# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# within the Gradle project.
#
# You can find Gradle at https://github.com/gradle/gradle/.
Expand All @@ -80,13 +80,10 @@ do
esac
done

APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit

APP_NAME="Gradle"
# This is normally unused
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}

# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum
Expand Down Expand Up @@ -133,22 +130,29 @@ location of your Java installation."
fi
else
JAVACMD=java
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
if ! command -v java >/dev/null 2>&1
then
die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
fi

# Increase the maximum file descriptors if we can.
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
case $MAX_FD in #(
max*)
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC3045
MAX_FD=$( ulimit -H -n ) ||
warn "Could not query maximum file descriptor limit"
esac
case $MAX_FD in #(
'' | soft) :;; #(
*)
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC3045
ulimit -n "$MAX_FD" ||
warn "Could not set maximum file descriptor limit to $MAX_FD"
esac
Expand Down Expand Up @@ -193,6 +197,10 @@ if "$cygwin" || "$msys" ; then
done
fi


# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'

# Collect all arguments for the java command;
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
# shell script including quotes and variable substitutions, so put them in
Expand All @@ -205,6 +213,12 @@ set -- \
org.gradle.wrapper.GradleWrapperMain \
"$@"

# Stop when "xargs" is not available.
if ! command -v xargs >/dev/null 2>&1
then
die "xargs is not available"
fi

# Use "xargs" to parse quoted args.
#
# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
Expand Down
15 changes: 9 additions & 6 deletions gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
@rem limitations under the License.
@rem

@if "%DEBUG%" == "" @echo off
@if "%DEBUG%"=="" @echo off
@rem ##########################################################################
@rem
@rem Gradle startup script for Windows
Expand All @@ -25,7 +25,8 @@
if "%OS%"=="Windows_NT" setlocal

set DIRNAME=%~dp0
if "%DIRNAME%" == "" set DIRNAME=.
if "%DIRNAME%"=="" set DIRNAME=.
@rem This is normally unused
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%

Expand All @@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome

set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
if "%ERRORLEVEL%" == "0" goto execute
if %ERRORLEVEL% equ 0 goto execute

echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
Expand Down Expand Up @@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar

:end
@rem End local scope for the variables with windows NT shell
if "%ERRORLEVEL%"=="0" goto mainEnd
if %ERRORLEVEL% equ 0 goto mainEnd

:fail
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
rem the _cmd.exe /c_ return code!
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
exit /b 1
set EXIT_CODE=%ERRORLEVEL%
if %EXIT_CODE% equ 0 set EXIT_CODE=1
if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
exit /b %EXIT_CODE%

:mainEnd
if "%OS%"=="Windows_NT" endlocal
Expand Down
10 changes: 5 additions & 5 deletions libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
[versions]
kotlin = "1.9.10"
ksp = "1.9.10-1.0.13"
kotlinpoet = "1.14.2"
kotlin = "1.9.21"
ksp = "1.9.21-1.0.15"
kotlinpoet = "1.15.1"
publishing = "0.25.3"
mockk = "1.13.7"
junit = "5.10.0"
mockk = "1.13.8"
junit = "5.10.1"
compileTesting = "1.5.0"
binaryvalidator = "0.13.2"

Expand Down
10 changes: 4 additions & 6 deletions trckr-core/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ plugins {

kotlin {
// Targets

applyDefaultHierarchyTemplate()
// JVM target
jvm {
compilations.all {
Expand All @@ -19,7 +19,7 @@ kotlin {
}
// JS target
// TODO: Currently not support arrays in annotations
// js(BOTH) {
// js(IR) {
// browser()
// nodejs()
// }
Expand Down Expand Up @@ -47,10 +47,8 @@ kotlin {

// SourceSets
sourceSets {
commonTest {
dependencies {
implementation(libs.kotlin.test)
}
commonTest.dependencies {
implementation(libs.kotlin.test)
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion trckr-demo/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,5 @@ tasks.withType<KotlinCompile>().configureEach {
}

sourceSets.configureEach {
kotlin.srcDir("$buildDir/generated/ksp/$name/kotlin/")
kotlin.srcDir(layout.buildDirectory.dir("/generated/ksp/$name/kotlin/"))
}
22 changes: 9 additions & 13 deletions trckr-processor/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -17,20 +17,16 @@ kotlin {
}

sourceSets {
getByName("jvmMain") {
dependencies {
implementation(project(":trckr-core"))
implementation(libs.ksp.api)
implementation(libs.bundles.kotlinpoet)
}
jvmMain.dependencies {
implementation(project(":trckr-core"))
implementation(libs.ksp.api)
implementation(libs.bundles.kotlinpoet)
}
getByName("jvmTest") {
dependencies {
implementation(libs.kotlin.test)
implementation(libs.junit)
implementation(libs.mockk)
implementation(libs.bundles.compile.testing)
}
jvmTest.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.1.4
1.1.5

0 comments on commit c9501cf

Please sign in to comment.