Skip to content

Commit

Permalink
Bump Kotlin to 2.0.0 and Compose to 1.6.11 (#386)
Browse files Browse the repository at this point in the history
* Bump Kotlin to 2.0.0 and Compose to 1.6.11

* Remove empty line
  • Loading branch information
hfhbd authored Jun 16, 2024
1 parent edd6cda commit f2c9985
Show file tree
Hide file tree
Showing 10 changed files with 656 additions and 382 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/CD.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
- name: Build with Gradle
run: ./gradlew build
- name: Publish
run: ./gradlew -Pversion=$version -Dorg.gradle.parallel=false publish closeAndReleaseStagingRepository
run: ./gradlew -Pversion=$version -Dorg.gradle.parallel=false publish closeAndReleaseStagingRepositories
env:
ORG_GRADLE_PROJECT_signingKey: ${{ secrets.SIGNING_PRIVATE_KEY }}
ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.SIGNING_PASSWORD }}
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ jobs:
if: github.event_name == 'pull_request'
- uses: gradle/actions/setup-gradle@v3
with:
validate-wrappers: true
dependency-graph: generate-and-submit
gradle-home-cache-cleanup: true
- name: Build with Gradle
Expand Down
18 changes: 0 additions & 18 deletions .github/workflows/gradleWrapper.yml

This file was deleted.

4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.gradle
.idea
.kotlin
build
local.properties
.DS_Store
.DS_Store
14 changes: 8 additions & 6 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -2,28 +2,29 @@ import java.util.*
import io.gitlab.arturbosch.detekt.*

plugins {
kotlin("multiplatform") version "1.9.23"
kotlin("multiplatform") version "2.0.0"
kotlin("plugin.compose") version "2.0.0"
id("org.jetbrains.compose") version "1.6.11"
id("maven-publish")
id("signing")
id("io.github.gradle-nexus.publish-plugin") version "1.3.0"
id("io.github.gradle-nexus.publish-plugin") version "2.0.0"
id("io.gitlab.arturbosch.detekt") version "1.23.6"
id("app.cash.licensee") version "1.11.0"
}

kotlin {
jvmToolchain(11)

jvm()
js(IR) {
browser()
}

explicitApi()
targets.configureEach {
compilations.configureEach {
kotlinOptions.allWarningsAsErrors = true
}
compilerOptions {
allWarningsAsErrors.set(true)
}

sourceSets {
configureEach {
languageSettings {
Expand All @@ -33,6 +34,7 @@ kotlin {
commonMain {
dependencies {
api(compose.runtime)
api(libs.kotlinx.coroutines.core)
api(libs.kotlinx.uuid)
}
}
Expand Down
1 change: 1 addition & 0 deletions integrationTest/browserRouterTest/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
plugins {
kotlin("js")
kotlin("plugin.compose")
id("org.jetbrains.compose")
}

Expand Down
2 changes: 2 additions & 0 deletions integrationTest/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
plugins {
kotlin("multiplatform")
kotlin("plugin.compose")
id("org.jetbrains.compose")
}

kotlin {
jvmToolchain(11)

jvm()
js(IR) {
browser()
Expand Down
1 change: 1 addition & 0 deletions integrationTest/hashRouterTest/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
plugins {
kotlin("js")
kotlin("plugin.compose")
id("org.jetbrains.compose")
}

Expand Down
Loading

0 comments on commit f2c9985

Please sign in to comment.