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

Jump to bottom

Kotlin 1 8 #151

Merged
merged 3 commits into from
Jan 13, 2023
Merged

Kotlin 1 8 #151

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift click to select a range
1995509
Bump plugin.serialization from 1.7.10 to 1.8.0
dependabot[bot] Jan 2, 2023
b5425c7
Bump Kotlin to 1.8
pjagielski Jan 13, 2023
1047e60
Fix cache keys
pjagielski Jan 13, 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
4 changes: 2 additions & 2 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 14,7 @@ jobs:

- restore_cache:
keys:
- v1-dependencies-{{ checksum "build.gradle" }}
- v1-dependencies-{{ checksum "build.gradle.kts" }}
- v1-dependencies-

- run:
Expand All @@ -30,7 30,7 @@ jobs:
- save_cache:
paths:
- ~/.gradle
key: v1-dependencies-{{ checksum "build.gradle" }}
key: v1-dependencies-{{ checksum "build.gradle.kts" }}

- run:
name: Test
Expand Down
2 changes: 2 additions & 0 deletions annotation-processor/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 9,8 @@ dependencies {
implementation("org.jetbrains.kotlin:kotlin-reflect:${Versions.kotlin}")
implementation("com.squareup:kotlinpoet:${Versions.kotlinpoet}")
implementation("com.squareup:kotlinpoet-metadata:${Versions.kotlinpoet}")
// needed until kotlipoet supports kotlin 1.8 directly
implementation("org.jetbrains.kotlinx:kotlinx-metadata-jvm:${Versions.kotlinxMetadata}")

api("org.hibernate.javax.persistence:hibernate-jpa-2.1-api:1.0.2.Final")

Expand Down
2 changes: 1 addition & 1 deletion build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 3,7 @@ import pl.touk.krush.gradle.signPublicationIfKeyPresent
plugins {
kotlin("jvm") apply true
kotlin("kapt") apply true
kotlin("plugin.serialization") version "1.7.10"
kotlin("plugin.serialization") version "1.8.0"
id("pl.allegro.tech.build.axion-release") version "1.13.14"
`maven-publish`
}
Expand Down
3 changes: 2 additions & 1 deletion buildSrc/src/main/kotlin/pl/touk/krush/gradle/Versions.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 1,10 @@
package pl.touk.krush.gradle

object Versions {
const val kotlin = "1.7.10"
const val kotlin = "1.8.0"
const val exposed = "0.38.2"
const val kotlinpoet = "1.12.0"
const val kotlinxMetadata = "0.5.0"
const val postgresDriver = "42.4.0"
const val junit = "5.8.2"
const val assertj = "3.23.1"
Expand Down