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

Upgrade to Kotlin 2.0.0 #612

Merged
merged 2 commits into from
Aug 30, 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
22 changes: 11 additions & 11 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,19 @@ buildscript {
mavenCentral()
}
dependencies {
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.24")
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.20")
}
}

plugins {
kotlin("multiplatform") version "1.9.24"
kotlin("native.cocoapods") version "1.9.24"
kotlin("plugin.serialization") version "1.9.24"
kotlin("multiplatform") version "2.0.20"
kotlin("native.cocoapods") version "2.0.20"
kotlin("plugin.serialization") version "2.0.20"
id("maven-publish")
id("dev.petuska.npm.publish") version "3.4.2"
id("com.diffplug.spotless") version "6.25.0"
id("io.gitlab.arturbosch.detekt") version("1.23.3")
id("com.google.devtools.ksp") version "1.9.24-1.0.20" // needs to be in-sync with Kotlin version. Version before the dash is the compatible Kotlin version.
id("com.google.devtools.ksp") version "2.0.20-1.0.24" // needs to be in-sync with Kotlin version. Version before the dash is the compatible Kotlin version.
}

allprojects {
Expand Down Expand Up @@ -52,7 +52,7 @@ allprojects {
}

group = "exchange.dydx.abacus"
version = "1.9.10"
version = "1.9.11"

repositories {
google()
Expand Down Expand Up @@ -118,7 +118,7 @@ kotlin {
implementation("io.ktor:ktor-http:$ktorVersion")
implementation("com.ionspin.kotlin:bignum:0.3.8")
implementation("tz.co.asoft:kollections-interoperable:2.0.16")
implementation("me.tatarka.inject:kotlin-inject-runtime:0.6.3")
implementation("me.tatarka.inject:kotlin-inject-runtime:0.7.1")
}
}
val commonTest by getting {
Expand Down Expand Up @@ -146,10 +146,10 @@ kotlin {
// KSP will eventually have better multiplatform support and we'll be able to simply have
// `ksp libs.kotlinInject.compiler` in the dependencies block of each source set
// https://github.com/google/ksp/pull/1021
add("kspJvm", "me.tatarka.inject:kotlin-inject-compiler-ksp:0.6.3")
add("kspJs", "me.tatarka.inject:kotlin-inject-compiler-ksp:0.6.3")
add("kspIosArm64", "me.tatarka.inject:kotlin-inject-compiler-ksp:0.6.3")
add("kspIosSimulatorArm64", "me.tatarka.inject:kotlin-inject-compiler-ksp:0.6.3")
add("kspJvm", "me.tatarka.inject:kotlin-inject-compiler-ksp:0.7.1")
add("kspJs", "me.tatarka.inject:kotlin-inject-compiler-ksp:0.7.1")
add("kspIosArm64", "me.tatarka.inject:kotlin-inject-compiler-ksp:0.7.1")
add("kspIosSimulatorArm64", "me.tatarka.inject:kotlin-inject-compiler-ksp:0.7.1")
}

tasks.wrapper {
Expand Down
2 changes: 1 addition & 1 deletion v4_abacus.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |spec|
spec.name = 'v4_abacus'
spec.version = '1.9.10'
spec.version = '1.9.11'
spec.homepage = 'https://github.com/dydxprotocol/v4-abacus'
spec.source = { :http=> ''}
spec.authors = ''
Expand Down