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 version to 1.2.4 #71

Merged
merged 2 commits into from
Jan 5, 2024
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
16 changes: 15 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,20 @@

- Date format: YYYY-MM-dd

## v1.2.4 / 2024-01-05

### All

* Update `Kotlin`'s version to `1.9.22`

### sqllin-dsl

* Update `kotlinx.serialization`'s version to `1.6.2`

### sqllin-processor

* Update `KSP`'s version to `1.9.22-1.0.16`

## v1.2.3 / 2023-11-28

### All
Expand Down Expand Up @@ -77,7 +91,7 @@ a runtime exception. Thanks for [@nbransby](https://github.com/nbransby).

* Add the new JVM target
* **Breaking change**: Remove the public property: `DatabaseConnection#closed`
* The Android (<= 9) target supports to set the `journalMode` and `synchronousMode` now
* The Android (< 9) target supports to set the `journalMode` and `synchronousMode` now

## v1.1.1 / 2023-08-12

Expand Down
2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ buildscript {
dependencies {
val kotlinVersion: String by project
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
classpath("com.android.tools.build:gradle:8.1.4")
classpath("com.android.tools.build:gradle:8.2.1")
}
}

Expand Down
8 changes: 5 additions & 3 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
VERSION=1.2.3
VERSION=1.2.4
GROUP=com.ctrip.kotlin

kotlinVersion=1.9.21
kspVersion=1.9.21-1.0.15
kotlinVersion=1.9.22
kspVersion=1.9.22-1.0.16
serializationVersion=1.6.2
coroutinesVersion=1.7.3
androidxAnnotationVersion=1.7.1

#Maven Publish Information
githubURL=https://github.com/ctripcorp/SQLlin
Expand Down
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 @@
#Tue Mar 08 15:11:46 CST 2022
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
3 changes: 2 additions & 1 deletion sample/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@ kotlin {
kotlin.srcDir("build/generated/ksp/metadata/commonMain/kotlin")
dependencies {
implementation(project(":sqllin-dsl"))
implementation("org.jetbrains.kotlinx:kotlinx-serialization-core:1.5.1")
val serializationVersion: String by project
implementation("org.jetbrains.kotlinx:kotlinx-serialization-core:${serializationVersion}")
val coroutinesVersion: String by project
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion")
}
Expand Down
5 changes: 3 additions & 2 deletions sqllin-driver/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,8 @@ kotlin {
}
val androidMain by getting {
dependencies {
implementation("androidx.annotation:annotation:1.7.0")
val androidxAnnotationVersion: String by project
implementation("androidx.annotation:annotation:${androidxAnnotationVersion}")
}
}
val androidInstrumentedTest by getting {
Expand All @@ -94,7 +95,7 @@ kotlin {

val jvmMain by getting {
dependencies {
implementation("org.xerial:sqlite-jdbc:3.43.0.0")
implementation("org.xerial:sqlite-jdbc:3.44.1.0")
}
}
}
Expand Down
8 changes: 2 additions & 6 deletions sqllin-dsl/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,8 @@ kotlin {
val commonMain by getting {
dependencies {
api(project(":sqllin-driver"))
implementation("org.jetbrains.kotlinx:kotlinx-serialization-core:1.5.1")
val serializationVersion: String by project
implementation("org.jetbrains.kotlinx:kotlinx-serialization-core:${serializationVersion}")
val coroutinesVersion: String by project
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion")
}
Expand All @@ -87,11 +88,6 @@ kotlin {
implementation(kotlin("test"))
}
}
val androidMain by getting {
dependencies {
implementation("androidx.annotation:annotation:1.7.0")
}
}
val androidInstrumentedTest by getting {
dependencies {
implementation("androidx.test:core:1.5.0")
Expand Down
2 changes: 1 addition & 1 deletion sqllin-processor/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ publishing {
artifactId = "sqllin-processor"
setArtifacts(
listOf(
"$buildDir/libs/sqllin-processor-$version.jar",
"${layout.buildDirectory}/libs/sqllin-processor-$version.jar",
javadocJar, sourceJar,
)
)
Expand Down
Loading