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

Updates Kotlin target to 1.6 #1119

Merged
merged 2 commits into from
Jun 8, 2023
Merged

Updates Kotlin target to 1.6 #1119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a474983
Updates Kotlin target to 1.6
rchowell Jun 8, 2023
d5c96cc
CHANGELOG.md
rchowell Jun 8, 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 CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Changed

- Updates Kotlin from 1.5.+ to 1.6; compile target remains 1.4
- Updates Kotlin target from 1.4 (DEPRECATED) to 1.6
- Moves PartiqlAst, PartiqlLogical, PartiqlLogicalResolved, and PartiqlPhysical (along with the transforms)
to a new project, `partiql-ast`. These are still imported into `partiql-lang` with the `api` annotation. Therefore,
no action is required to consume the migrated classes. However, this now gives consumers of the AST, Experimental Plans,
Expand Down
16 changes: 8 additions & 8 deletions buildSrc/src/main/kotlin/partiql.conventions.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ dependencies {
}

java {
sourceCompatibility = JavaVersion.toVersion(Versions.javaTarget)
targetCompatibility = JavaVersion.toVersion(Versions.javaTarget)
sourceCompatibility = JavaVersion.toVersion(Versions.jvmTarget)
targetCompatibility = JavaVersion.toVersion(Versions.jvmTarget)
}

tasks.test {
Expand All @@ -60,15 +60,15 @@ tasks.test {
}

tasks.compileKotlin {
kotlinOptions.jvmTarget = Versions.javaTarget
kotlinOptions.apiVersion = Versions.kotlinTarget
kotlinOptions.languageVersion = Versions.kotlinTarget
kotlinOptions.jvmTarget = Versions.jvmTarget
kotlinOptions.apiVersion = Versions.kotlinApi
kotlinOptions.languageVersion = Versions.kotlinLanguage
}

tasks.compileTestKotlin {
kotlinOptions.jvmTarget = Versions.javaTarget
kotlinOptions.apiVersion = Versions.kotlinTarget
kotlinOptions.languageVersion = Versions.kotlinTarget
kotlinOptions.jvmTarget = Versions.jvmTarget
kotlinOptions.apiVersion = Versions.kotlinApi
kotlinOptions.languageVersion = Versions.kotlinLanguage
}

configure<KtlintExtension> {
Expand Down
7 changes: 3 additions & 4 deletions buildSrc/src/main/kotlin/partiql.versions.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,9 @@
object Versions {
// Language
const val kotlin = "1.6.20"
const val kotlinTarget = "1.4"
const val javaTarget = "1.8"
const val kotlinLanguage = "1.6"
const val kotlinApi = "1.6"
const val jvmTarget = "1.8"

// Dependencies
const val antlr = "4.10.1"
Expand All @@ -29,7 +30,6 @@ object Versions {
const val dotlin = "1.0.2"
const val gson = "2.10.1"
const val guava = "31.1-jre"
const val ionBuilder = "1.0.0"
const val ionElement = "1.0.0"
const val ionJava = "1.9.0"
const val ionSchema = "1.2.1"
Expand Down Expand Up @@ -70,7 +70,6 @@ object Deps {
const val guava = "com.google.guava:guava:${Versions.guava}"
const val ionJava = "com.amazon.ion:ion-java:${Versions.ionJava}"
const val ionElement = "com.amazon.ion:ion-element:${Versions.ionElement}"
const val ionBuilder = "com.amazon.ion:ion-kotlin-builder:${Versions.ionBuilder}"
const val ionSchema = "com.amazon.ion:ion-schema-kotlin:${Versions.ionSchema}"
const val jansi = "org.fusesource.jansi:jansi:${Versions.jansi}"
const val jline = "org.jline:jline:${Versions.jline}"
Expand Down