Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update dependencies #894

Merged
merged 1 commit into from
Nov 22, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/deployment-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
uses: actions/setup-java@v3
with:
distribution: temurin
java-version: 8
java-version: 11
- name: Build with Gradle
uses: gradle/gradle-build-action@v2
with:
Expand All @@ -52,7 +52,7 @@ jobs:
uses: actions/setup-java@v3
with:
distribution: temurin
java-version: 8
java-version: 11
- name: Build with Gradle
uses: gradle/gradle-build-action@v2
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docs-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
uses: actions/setup-java@v3
with:
distribution: temurin
java-version: 8
java-version: 11
- name: Build docs with Gradle
uses: gradle/gradle-build-action@v2
with:
Expand Down
1 change: 1 addition & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,4 @@ kotlin.code.style=official
# https://github.com/Kotlin/kotlinx-atomicfu#atomicfu-compiler-plugin
kotlinx.atomicfu.enableJvmIrTransformation=true
kotlinx.atomicfu.enableJsIrTransformation=true
kotlinx.atomicfu.enableNativeIrTransformations=true
14 changes: 7 additions & 7 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

# api dependencies
kotlin = "1.9.20" # https://github.com/JetBrains/kotlin
ktor = "2.3.5" # https://github.com/ktorio/ktor
ktor = "2.3.6" # https://github.com/ktorio/ktor
kotlinx-coroutines = "1.7.3" # https://github.com/Kotlin/kotlinx.coroutines
kotlinx-serialization = "1.6.0" # https://github.com/Kotlin/kotlinx.serialization
kotlinx-serialization = "1.6.1" # https://github.com/Kotlin/kotlinx.serialization
kotlinx-datetime = "0.4.1" # https://github.com/Kotlin/kotlinx-datetime
kotlin-logging = "3.0.5" # https://github.com/oshai/kotlin-logging
kord-cache = "0.4.0" # https://github.com/kordlib/cache
Expand All @@ -16,19 +16,19 @@ stately = "2.0.5" # https://github.com/touchlab/Stately
fastZlib = "2.0.1" # https://github.com/timotejroiko/fast-zlib

# code generation
ksp = "1.9.20-1.0.13" # https://github.com/google/ksp
kotlinpoet = "1.14.2" # https://github.com/square/kotlinpoet
ksp = "1.9.20-1.0.14" # https://github.com/google/ksp
kotlinpoet = "1.15.1" # https://github.com/square/kotlinpoet

# tests
junit5 = "5.10.0" # https://github.com/junit-team/junit5
junit5 = "5.10.1" # https://github.com/junit-team/junit5
mockk = "1.13.8" # https://github.com/mockk/mockk
slf4j = "2.0.9" # https://www.slf4j.org

# plugins
dokka = "1.9.10" # https://github.com/Kotlin/dokka
kotlinx-atomicfu = "0.22.0" # https://github.com/Kotlin/kotlinx-atomicfu
kotlinx-atomicfu = "0.23.0" # https://github.com/Kotlin/kotlinx-atomicfu
binary-compatibility-validator = "0.13.2" # https://github.com/Kotlin/binary-compatibility-validator
buildconfig = "4.1.2" # https://github.com/gmazzo/gradle-buildconfig-plugin
buildconfig = "4.2.0" # https://github.com/gmazzo/gradle-buildconfig-plugin


[libraries]
Expand Down
21 changes: 11 additions & 10 deletions ksp-processors/src/main/kotlin/KotlinPoetDsl.kt
Original file line number Diff line number Diff line change
Expand Up @@ -43,31 +43,32 @@ internal inline fun <reified A : Annotation> Annotatable.Builder<*>.addAnnotatio
addAnnotation(AnnotationSpec.builder(A::class).apply(builder).build())


// extensions for `FileSpec.Builder`
// extensions for `TypeSpecHolder.Builder`

internal inline fun <T : TypeSpecHolder.Builder<T>> T.addClass(name: String, builder: TypeSpecBuilder) =
addType(TypeSpec.classBuilder(name).apply(builder).build())

internal inline fun FileSpec.Builder.addClass(className: ClassName, builder: TypeSpecBuilder) =
internal inline fun <T : TypeSpecHolder.Builder<T>> T.addClass(className: ClassName, builder: TypeSpecBuilder) =
addType(TypeSpec.classBuilder(className).apply(builder).build())

internal inline fun <T : TypeSpecHolder.Builder<T>> T.addObject(name: String, builder: TypeSpecBuilder) =
addType(TypeSpec.objectBuilder(name).apply(builder).build())


// extensions for `FileSpec.Builder`

internal inline fun FileSpec.Builder.addFunction(name: String, builder: FunSpecBuilder) =
addFunction(FunSpec.builder(name).apply(builder).build())


// extensions for `TypeSpec.Builder`
internal inline fun TypeSpec.Builder.addClass(name: String, builder: TypeSpecBuilder) =
addType(TypeSpec.classBuilder(name).apply(builder).build())

internal inline fun TypeSpec.Builder.addClass(className: ClassName, builder: TypeSpecBuilder) =
addType(TypeSpec.classBuilder(className).apply(builder).build())

internal inline fun TypeSpec.Builder.addCompanionObject(name: String? = null, builder: TypeSpecBuilder) =
addType(TypeSpec.companionObjectBuilder(name).apply(builder).build())

internal inline fun TypeSpec.Builder.addFunction(name: String, builder: FunSpecBuilder) =
addFunction(FunSpec.builder(name).apply(builder).build())

internal inline fun TypeSpec.Builder.addObject(name: String, builder: TypeSpecBuilder) =
addType(TypeSpec.objectBuilder(name).apply(builder).build())

internal inline fun <reified T> TypeSpec.Builder.addProperty(
name: String,
vararg modifiers: KModifier,
Expand Down