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.

Sign up for GitHub

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

更新 Kotlinx Serialization 到 v1.6.0 #739

Merged
merged 6 commits into from
Aug 30, 2023
Merged

更新 Kotlinx Serialization 到 v1.6.0 #739

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
33a9592
WIP: Upgrade kotlin to 1.9.0
ForteScarlet Aug 8, 2023
bfccf89
WIP: Upgrade kotlin to 1.9.0
ForteScarlet Aug 30, 2023
a8298f8
build: 更新Kotlin到 1.9.10; 优化针对Java的异步桥接函数的内部实现
ForteScarlet Aug 30, 2023
7d80666
build: 更新CI中gradle版本到 8.3; upgrade yarn.lock
ForteScarlet Aug 30, 2023
fa224fd
fix: 更新部分过时代码
ForteScarlet Aug 30, 2023
83ae4a6
build: 更新 Kotlinx Serialization 到 v1.6.0
ForteScarlet Aug 30, 2023
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
2 changes: 1 addition & 1 deletion .github/workflows/kdoc.yml.bk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
- name: Gradle generate documentation
uses: gradle/gradle-build-action@v2
with:
gradle-version: 7.6
gradle-version: 8.3
arguments: |
-Porg.gradle.jvmargs="-XX:MaxMetaspaceSize=1g -Dfile.encoding=UTF-8"
-Porg.gradle.daemon=false
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/publish-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,14 @@ jobs:
- name: Run All Tests
uses: gradle/gradle-build-action@v2
with:
gradle-version: 7.6
gradle-version: 8.3
arguments: clean assemble test

# setup Gradle
- name: Gradle Publish Release
uses: gradle/gradle-build-action@v2
with:
gradle-version: 7.6
gradle-version: 8.3
arguments: |
publishToSonatype
closeAndReleaseStagingRepository
Expand Down Expand Up @@ -81,7 +81,7 @@ jobs:
- name: Gradle publish snapshot
uses: gradle/gradle-build-action@v2
with:
gradle-version: 7.6
gradle-version: 8.3
arguments: |
publishToSonatype
closeAndReleaseStagingRepository
Expand Down Expand Up @@ -120,7 +120,7 @@ jobs:
- name: Gradle generate documentation
uses: gradle/gradle-build-action@v2
with:
gradle-version: 7.6
gradle-version: 8.3
arguments: |
dokkaHtmlMultiModule
--info
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/publish-snapshot.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,13 @@ jobs:
- name: Run All Tests
uses: gradle/gradle-build-action@v2
with:
gradle-version: 7.6
gradle-version: 8.3
arguments: assemble allTests

- name: Gradle publish snapshot
uses: gradle/gradle-build-action@v2
with:
gradle-version: 7.6
gradle-version: 8.3
arguments: |
publishToSonatype
closeAndReleaseStagingRepository
Expand Down Expand Up @@ -88,7 +88,7 @@ jobs:
- name: Gradle generate documentation
uses: gradle/gradle-build-action@v2
with:
gradle-version: 7.6
gradle-version: 8.3
arguments: |
dokkaHtmlMultiModule
--info
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-branch.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
- name: Run All Tests
uses: gradle/gradle-build-action@v2
with:
gradle-version: 7.6
gradle-version: 8.3
arguments: |
assemble
build
Expand Down
4 changes: 2 additions & 2 deletions buildSrc/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ repositories {
mavenLocal()
}

val kotlinVersion = "1.8.21"
val kotlinVersion = "1.9.10"
val dokkaPluginVersion = "1.8.20"
val suspendTransformVersion = "0.3.1"
val suspendTransformVersion = "0.5.0"
val gradleCommon = "0.1.1"
val ktor = "2.3.1"

Expand Down
2 changes: 1 addition & 1 deletion buildSrc/src/main/kotlin/P.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ sealed class P(override val group: String) : ProjectDetail() {
val versionWithoutSnapshot: Version

init {
val mainVersion = version(3, 2, 0)
val mainVersion = version(3, 3, 0)

fun initVersionWithoutSnapshot(status: Version?): Version = if (status == null) {
mainVersion
Expand Down
2 changes: 1 addition & 1 deletion buildSrc/src/main/kotlin/SuspendTransforms.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ object SuspendTransforms {
*/
val jvmAsyncTransformer = SuspendTransformConfiguration.jvmAsyncTransformer.copy(
syntheticFunctionIncludeAnnotations = includeAnnotations,
transformFunctionInfo = FunctionInfo("love.forte.simbot.utils", null, "$\$runInAsync1"),
transformFunctionInfo = FunctionInfo("love.forte.simbot.utils", null, "$\$runInAsyncNullable"),
copyAnnotationExcludes = SuspendTransformConfiguration.jvmAsyncTransformer.copyAnnotationExcludes + SuspendTransformConfiguration.jvmAsyncTransformer.markAnnotation.classInfo
)

Expand Down
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[versions]
kotlinx-coroutines = "1.7.1"
kotlinx-serialization = "1.5.1"
kotlinx-serialization = "1.6.0"
spring-boot = "2.7.12"
openjdk-jmh = "1.36"
#forte-di = "0.0.3"
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading
Loading