Skip to content

Commit

Permalink
build(deps): bump Kotlin to _2.0.0_
Browse files Browse the repository at this point in the history
Signed-off-by: Art Shendrik <[email protected]>
  • Loading branch information
amal committed May 25, 2024
1 parent 017136f commit fe33b5a
Show file tree
Hide file tree
Showing 28 changed files with 723 additions and 475 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,11 @@ env:
CI: true
BUILD_NUMBER: ${{ github.run_number }}
SCM_TAG: ${{ github.sha }}
#GRADLE_OPTS: "-Dorg.gradle.daemon=false"
GRADLE_BUILD_ACTION_CACHE_DEBUG_ENABLED: true
DEPENDENCY_GRAPH_INCLUDE_CONFIGURATIONS: "^(?!(classpath)).*"
DEPENDENCY_GRAPH_INCLUDE_PROJECTS: "^:(?!(buildSrc|test|check)).*"
GRADLE_OPTS: |
-Pkotlin.build.report.output=build_scan
jobs:
buildAndCheck:
Expand Down
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@

[//]: # (Removed, Added, Changed, Fixed, Updated)

### Updated
- **bump Kotlin to _2.0.0_.**


## [0.9.1] - 2024-05-25

Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Convenience Gradle plugin for reliable configuration of Kotlin & KMP projects
Initially made for the [Fluxo][fluxo] state management framework and other libraries, then published for general use.

Targeted for Gradle 8+ and Kotlin 1.9+. Built with:<br>
[![Kotlin](http://img.shields.io/badge/Kotlin-1.9.24-7F52FF?logo=kotlin&logoWidth=10&logoColor=7F52FF&labelColor=2B2B2B)](https://github.com/JetBrains/Kotlin)
[![Kotlin](http://img.shields.io/badge/Kotlin-2.0.0-7F52FF?logo=kotlin&logoWidth=10&logoColor=7F52FF&labelColor=2B2B2B)](https://github.com/JetBrains/Kotlin)
[![Gradle](http://img.shields.io/badge/Gradle-8.8-f68244?logo=gradle&labelColor=2B2B2B)](https://gradle.org/releases/)
[![Android Gradle Plugin](http://img.shields.io/badge/Android--Gradle--Plugin-8.4-0E3B1A?logo=android&labelColor=2B2B2B)](https://mvnrepository.com/artifact/com.android.tools.build/gradle?repo=google)

Expand All @@ -32,7 +32,7 @@ Targeted for Gradle 8+ and Kotlin 1.9+. Built with:<br>
```kotlin
// in the `build.gradle.kts` of the target module
plugins {
kotlin("multiplatform") version "1.9.24"
kotlin("multiplatform") version "2.0.0"
id("io.github.fluxo-kt.fluxo-kmp-conf") version "0.9.1" // <-- add here
}
```
Expand All @@ -45,7 +45,7 @@ plugins {
```kotlin
// in the `build.gradle.kts` of the target module
plugins {
kotlin("multiplatform") version "1.9.24"
kotlin("multiplatform") version "2.0.0"
id("io.github.fluxo-kt.fluxo-kmp-conf") // <-- add here, no version needed for jitpack usage
}
```
Expand Down
2 changes: 2 additions & 0 deletions ROADMAP.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
<details>
<summary>Show</summary>

* Kotlin Power-assert compiler plugin
* https://kotlinlang.org/docs/whatsnew20.html#experimental-kotlin-power-assert-compiler-plugin
* https://github.com/ZacSweers/MoshiX/pull/553/files
* https://github.com/nebula-plugins/gradle-lint-plugin
* https://github.com/jacobras/Human-Readable/commit/041c5dedbd2aa1079616ceb445c93ab3c7547630
Expand Down
2 changes: 2 additions & 0 deletions checks/compose-desktop/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import org.jetbrains.compose.desktop.application.dsl.TargetFormat
plugins {
alias(libs.plugins.kotlin.jvm)
alias(libs.plugins.android.lint)
alias(libs.plugins.kotlin.compose)
alias(libs.plugins.jetbrains.compose)
id("io.github.fluxo-kt.fluxo-kmp-conf")
}
Expand Down Expand Up @@ -39,6 +40,7 @@ dependencies {
// For a library, use compose.desktop.common.
// With compose.desktop.common you will also lose @Preview functionality.
implementation(compose.desktop.currentOs)
implementation(compose.components.resources)

testImplementation(compose.desktop.uiTestJUnit4)
}
Expand Down
47 changes: 22 additions & 25 deletions checks/compose-desktop/dependencies/classpath.txt
Original file line number Diff line number Diff line change
Expand Up @@ -151,35 +151,32 @@ org.jdom:jdom2:2.0.6
org.jetbrains.compose:compose-gradle-plugin:1.6.10
org.jetbrains.compose:org.jetbrains.compose.gradle.plugin:1.6.10
org.jetbrains.intellij.deps:trove4j:1.0.20200330
org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:1.9.24
org.jetbrains.kotlin:kotlin-android-extensions:1.9.24
org.jetbrains.kotlin:kotlin-build-tools-api:1.9.24
org.jetbrains.kotlin:kotlin-compiler-embeddable:1.9.24
org.jetbrains.kotlin:kotlin-compiler-runner:1.9.24
org.jetbrains.kotlin:kotlin-daemon-client:1.9.24
org.jetbrains.kotlin:kotlin-daemon-embeddable:1.9.24
org.jetbrains.kotlin:kotlin-gradle-plugin-annotations:1.9.24
org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.9.24
org.jetbrains.kotlin:kotlin-gradle-plugin-idea-proto:1.9.24
org.jetbrains.kotlin:kotlin-gradle-plugin-idea:1.9.24
org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.9.24
org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.24
org.jetbrains.kotlin:kotlin-gradle-plugins-bom:1.9.24
org.jetbrains.kotlin:kotlin-klib-commonizer-api:1.9.24
org.jetbrains.kotlin:kotlin-native-utils:1.9.24
org.jetbrains.kotlin:kotlin-project-model:1.9.24
org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:2.0.0
org.jetbrains.kotlin.plugin.compose:org.jetbrains.kotlin.plugin.compose.gradle.plugin:2.0.0
org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.0
org.jetbrains.kotlin:kotlin-build-statistics:2.0.0
org.jetbrains.kotlin:kotlin-build-tools-api:2.0.0
org.jetbrains.kotlin:kotlin-compiler-embeddable:2.0.0
org.jetbrains.kotlin:kotlin-compiler-runner:2.0.0
org.jetbrains.kotlin:kotlin-daemon-client:2.0.0
org.jetbrains.kotlin:kotlin-daemon-embeddable:2.0.0
org.jetbrains.kotlin:kotlin-gradle-plugin-annotations:2.0.0
org.jetbrains.kotlin:kotlin-gradle-plugin-api:2.0.0
org.jetbrains.kotlin:kotlin-gradle-plugin-idea-proto:2.0.0
org.jetbrains.kotlin:kotlin-gradle-plugin-idea:2.0.0
org.jetbrains.kotlin:kotlin-gradle-plugin-model:2.0.0
org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.0
org.jetbrains.kotlin:kotlin-gradle-plugins-bom:2.0.0
org.jetbrains.kotlin:kotlin-klib-commonizer-api:2.0.0
org.jetbrains.kotlin:kotlin-native-utils:2.0.0
org.jetbrains.kotlin:kotlin-reflect:1.9.22
org.jetbrains.kotlin:kotlin-script-runtime:1.9.24
org.jetbrains.kotlin:kotlin-scripting-common:1.9.24
org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.9.24
org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.9.24
org.jetbrains.kotlin:kotlin-scripting-jvm:1.9.24
org.jetbrains.kotlin:kotlin-script-runtime:2.0.0
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.20
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.20
org.jetbrains.kotlin:kotlin-stdlib:1.9.22
org.jetbrains.kotlin:kotlin-tooling-core:1.9.24
org.jetbrains.kotlin:kotlin-util-io:1.9.24
org.jetbrains.kotlin:kotlin-util-klib:1.9.24
org.jetbrains.kotlin:kotlin-tooling-core:2.0.0
org.jetbrains.kotlin:kotlin-util-io:2.0.0
org.jetbrains.kotlin:kotlin-util-klib:2.0.0
org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.0
org.jetbrains.kotlinx:kotlinx-html-jvm:0.8.1
org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.4.1
Expand Down
4 changes: 2 additions & 2 deletions checks/compose-desktop/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
org.gradle.jvmargs=-Xmx3G -Dfile.encoding=UTF-8 -XX:+UseParallelGC
kotlin.daemon.jvmargs=-Xmx2G -XX:+UseParallelGC
org.gradle.jvmargs=-Xmx3G -XX:MaxMetaspaceSize=1G -XX:+UseParallelGC -Dfile.encoding=UTF-8
kotlin.daemon.jvmargs=-Xmx3G -XX:MaxMetaspaceSize=1G -XX:+UseParallelGC
kotlin.daemon.useFallbackStrategy=false
MAX_DEBUG=true
45 changes: 20 additions & 25 deletions checks/gradle-plugin/dependencies/classpath.txt
Original file line number Diff line number Diff line change
Expand Up @@ -153,35 +153,30 @@ org.glassfish.jaxb:jaxb-runtime:2.3.2
org.glassfish.jaxb:txw2:2.3.2
org.jdom:jdom2:2.0.6
org.jetbrains.intellij.deps:trove4j:1.0.20200330
org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:1.9.24
org.jetbrains.kotlin:kotlin-android-extensions:1.9.24
org.jetbrains.kotlin:kotlin-build-tools-api:1.9.24
org.jetbrains.kotlin:kotlin-compiler-embeddable:1.9.24
org.jetbrains.kotlin:kotlin-compiler-runner:1.9.24
org.jetbrains.kotlin:kotlin-daemon-client:1.9.24
org.jetbrains.kotlin:kotlin-daemon-embeddable:1.9.24
org.jetbrains.kotlin:kotlin-gradle-plugin-annotations:1.9.24
org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.9.24
org.jetbrains.kotlin:kotlin-gradle-plugin-idea-proto:1.9.24
org.jetbrains.kotlin:kotlin-gradle-plugin-idea:1.9.24
org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.9.24
org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.24
org.jetbrains.kotlin:kotlin-gradle-plugins-bom:1.9.24
org.jetbrains.kotlin:kotlin-klib-commonizer-api:1.9.24
org.jetbrains.kotlin:kotlin-native-utils:1.9.24
org.jetbrains.kotlin:kotlin-project-model:1.9.24
org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:2.0.0
org.jetbrains.kotlin:kotlin-build-statistics:2.0.0
org.jetbrains.kotlin:kotlin-build-tools-api:2.0.0
org.jetbrains.kotlin:kotlin-compiler-embeddable:2.0.0
org.jetbrains.kotlin:kotlin-compiler-runner:2.0.0
org.jetbrains.kotlin:kotlin-daemon-client:2.0.0
org.jetbrains.kotlin:kotlin-daemon-embeddable:2.0.0
org.jetbrains.kotlin:kotlin-gradle-plugin-annotations:2.0.0
org.jetbrains.kotlin:kotlin-gradle-plugin-api:2.0.0
org.jetbrains.kotlin:kotlin-gradle-plugin-idea-proto:2.0.0
org.jetbrains.kotlin:kotlin-gradle-plugin-idea:2.0.0
org.jetbrains.kotlin:kotlin-gradle-plugin-model:2.0.0
org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.0
org.jetbrains.kotlin:kotlin-gradle-plugins-bom:2.0.0
org.jetbrains.kotlin:kotlin-klib-commonizer-api:2.0.0
org.jetbrains.kotlin:kotlin-native-utils:2.0.0
org.jetbrains.kotlin:kotlin-reflect:1.9.22
org.jetbrains.kotlin:kotlin-script-runtime:1.9.24
org.jetbrains.kotlin:kotlin-scripting-common:1.9.24
org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.9.24
org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.9.24
org.jetbrains.kotlin:kotlin-scripting-jvm:1.9.24
org.jetbrains.kotlin:kotlin-script-runtime:2.0.0
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.20
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.20
org.jetbrains.kotlin:kotlin-stdlib:1.9.22
org.jetbrains.kotlin:kotlin-tooling-core:1.9.24
org.jetbrains.kotlin:kotlin-util-io:1.9.24
org.jetbrains.kotlin:kotlin-util-klib:1.9.24
org.jetbrains.kotlin:kotlin-tooling-core:2.0.0
org.jetbrains.kotlin:kotlin-util-io:2.0.0
org.jetbrains.kotlin:kotlin-util-klib:2.0.0
org.jetbrains.kotlinx.binary-compatibility-validator:org.jetbrains.kotlinx.binary-compatibility-validator.gradle.plugin:0.14.0
org.jetbrains.kotlinx:binary-compatibility-validator:0.14.0
org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.0
Expand Down
4 changes: 2 additions & 2 deletions checks/gradle-plugin/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
org.gradle.jvmargs=-Xmx2G -Dfile.encoding=UTF-8 -XX:+UseParallelGC
kotlin.daemon.jvmargs=-Xmx1G -XX:+UseParallelGC
org.gradle.jvmargs=-Xmx3G -XX:MaxMetaspaceSize=1G -XX:+UseParallelGC -Dfile.encoding=UTF-8
kotlin.daemon.jvmargs=-Xmx3G -XX:MaxMetaspaceSize=1G -XX:+UseParallelGC
kotlin.daemon.useFallbackStrategy=false
MAX_DEBUG=true
Loading

0 comments on commit fe33b5a

Please sign in to comment.