Skip to content

Commit

Permalink
[WIP] build(deps)!: bump Kotlin to 2.0.0-RC3
Browse files Browse the repository at this point in the history
- remove deprecated Kotlin/Native targets, removed in Kotlin 2.0

Signed-off-by: Art Shendrik <[email protected]>
  • Loading branch information
amal committed May 18, 2024
1 parent dda7ad4 commit 3024e56
Show file tree
Hide file tree
Showing 42 changed files with 704 additions and 739 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ jobs:
# amend the `dependencyGuardBaseline` and `kotlinUpgradeYarnLock` task results

- name: Initialize CodeQL
if: matrix.os == 'ubuntu'
if: false # matrix.os == 'ubuntu'
uses: github/codeql-action/init@v3
with:
languages: ${{ matrix.language }}
Expand Down Expand Up @@ -177,7 +177,7 @@ jobs:
compression-level: 9

- name: Perform CodeQL Analysis
if: matrix.os == 'ubuntu'
if: false # matrix.os == 'ubuntu'
timeout-minutes: 6
uses: github/codeql-action/analyze@v3
with:
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
[//]: # (Removed, Added, Changed, Fixed, Updated)

### Updated
- bump Kotlin to _2.0.0-RC3_.
- bump com.mikepenz.aboutlibraries to _11.1.4_.


Expand Down
48 changes: 21 additions & 27 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ 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.23-7F52FF?logo=kotlin&logoWidth=10&logoColor=7F52FF&labelColor=2B2B2B)](https://github.com/JetBrains/Kotlin)
[![Gradle](http://img.shields.io/badge/Gradle-8.7-f68244?logo=gradle&labelColor=2B2B2B)](https://gradle.org/releases/)
[![Kotlin](http://img.shields.io/badge/Kotlin-2.0.0-RC3-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)

### How to use
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.23"
kotlin("multiplatform") version "2.0.0-RC3"
id("io.github.fluxo-kt.fluxo-kmp-conf") version "0.8.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.23"
kotlin("multiplatform") version "2.0.0-RC3"
id("io.github.fluxo-kt.fluxo-kmp-conf") // <-- add here, no version needed for jitpack usage
}
```
Expand Down Expand Up @@ -81,20 +81,14 @@ pluginManagement {
| '-- android
'-- nonJvm
|-- commonJs
|-- js
'-- commonWasm (unstable, may be not available)
|-- wasmJs
'-- wasmWasi
| |-- js
| '-- commonWasm (unstable, may be not available)
| |-- wasmJs
| '-- wasmWasi (experimental)
'-- native
|-- androidNative (tier 3)
| |-- androidNativeArm32
| |-- androidNativeArm64
| |-- androidNativeX64
| '-- androidNativeX86
|-- unix
|-- nix (unix-like systems)
| |-- apple
| | |-- ios
| | | |-- iosArm32 (deprecated)
| | | |-- iosArm64
| | | |-- iosX64
| | | '-- iosSimulatorArm64
Expand All @@ -110,19 +104,19 @@ pluginManagement {
| | |-- watchosArm64
| | |-- watchosDeviceArm64 (tier 3)
| | |-- watchosX64
| | |-- watchosX86 (deprecated)
| | '-- watchosSimulatorArm64
| '-- linux
| |-- linuxArm32Hfp (deprecated)
| |-- linuxArm64
| |-- linuxMips32 (deprecated)
| |-- linuxMipsel32
| '-- linuxX64 (deprecated)
|-- mingw
| |-- mingwX64
| '-- mingwX86 (deprecated)
'-- wasmNative
'-- wasm32 (deprecated)
| |-- linux
| | |-- linuxArm32Hfp (deprecated)
| | |-- linuxArm64
| | '-- linuxX64
| '-- androidNative (tier 3, can has limited set of POSIX APIs)
| |-- androidNativeArm32
| |-- androidNativeArm64
| |-- androidNativeX64
| '-- androidNativeX86
'-- mingw
|-- mingwX64
'-- mingwX86 (deprecated)
```


Expand Down
4 changes: 3 additions & 1 deletion checks/compose-desktop/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import org.jetbrains.compose.desktop.application.dsl.TargetFormat

plugins {
alias(libs.plugins.kotlin.jvm)
alias(libs.plugins.kotlin.compose)
alias(libs.plugins.jetbrains.compose)
id("io.github.fluxo-kt.fluxo-kmp-conf")
}
Expand All @@ -28,9 +29,10 @@ tasks.named<Jar>("jar") {
// https://github.com/JetBrains/compose-multiplatform/blob/e1aff75/tutorials/Native_distributions_and_local_execution/README.md

fkcSetupKotlinApp {
javaLangTarget = "17"
useJdkRelease = false
replaceOutgoingJar = true
shrink { fullMode = true }
shrinkWithProGuard()
}

dependencies {
Expand Down
6 changes: 5 additions & 1 deletion checks/gradle-plugin/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,11 @@ group = "io.github.fluxo-kt"
version = libs.versions.version.get()

fkcSetupGradlePlugin {
allWarningsAsErrors = true
javaLangTarget = "20"
useJdkRelease = false

allWarningsAsErrors = false
enableApiValidation = false

// Two separate processing chains.
// First provides the output jar for the module.
Expand Down
50 changes: 23 additions & 27 deletions checks/gradle-plugin/dependencies/classpath.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ com.dropbox.dependency-guard:com.dropbox.dependency-guard.gradle.plugin:0.5.0
com.dropbox.dependency-guard:dependency-guard:0.5.0
com.github.ben-manes.versions:com.github.ben-manes.versions.gradle.plugin:0.51.0
com.github.ben-manes:gradle-versions-plugin:0.51.0
com.google.code.gson:gson:2.8.9
com.googlecode.concurrent-trees:concurrent-trees:2.6.1
com.googlecode.javaewah:JavaEWAH:1.2.3
com.gradle.plugin-publish:com.gradle.plugin-publish.gradle.plugin:1.2.1
Expand Down Expand Up @@ -45,35 +46,30 @@ org.checkerframework:checker-qual:3.21.2
org.eclipse.jgit:org.eclipse.jgit:6.7.0.202309050840-r
org.eclipse.platform:org.eclipse.osgi:3.18.300
org.jetbrains.intellij.deps:trove4j:1.0.20200330
org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:1.9.23
org.jetbrains.kotlin:kotlin-android-extensions:1.9.23
org.jetbrains.kotlin:kotlin-build-tools-api:1.9.23
org.jetbrains.kotlin:kotlin-compiler-embeddable:1.9.23
org.jetbrains.kotlin:kotlin-compiler-runner:1.9.23
org.jetbrains.kotlin:kotlin-daemon-client:1.9.23
org.jetbrains.kotlin:kotlin-daemon-embeddable:1.9.23
org.jetbrains.kotlin:kotlin-gradle-plugin-annotations:1.9.23
org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.9.23
org.jetbrains.kotlin:kotlin-gradle-plugin-idea-proto:1.9.23
org.jetbrains.kotlin:kotlin-gradle-plugin-idea:1.9.23
org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.9.23
org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.23
org.jetbrains.kotlin:kotlin-gradle-plugins-bom:1.9.23
org.jetbrains.kotlin:kotlin-klib-commonizer-api:1.9.23
org.jetbrains.kotlin:kotlin-native-utils:1.9.23
org.jetbrains.kotlin:kotlin-project-model:1.9.23
org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:2.0.0-RC3
org.jetbrains.kotlin:kotlin-build-statistics:2.0.0-RC3
org.jetbrains.kotlin:kotlin-build-tools-api:2.0.0-RC3
org.jetbrains.kotlin:kotlin-compiler-embeddable:2.0.0-RC3
org.jetbrains.kotlin:kotlin-compiler-runner:2.0.0-RC3
org.jetbrains.kotlin:kotlin-daemon-client:2.0.0-RC3
org.jetbrains.kotlin:kotlin-daemon-embeddable:2.0.0-RC3
org.jetbrains.kotlin:kotlin-gradle-plugin-annotations:2.0.0-RC3
org.jetbrains.kotlin:kotlin-gradle-plugin-api:2.0.0-RC3
org.jetbrains.kotlin:kotlin-gradle-plugin-idea-proto:2.0.0-RC3
org.jetbrains.kotlin:kotlin-gradle-plugin-idea:2.0.0-RC3
org.jetbrains.kotlin:kotlin-gradle-plugin-model:2.0.0-RC3
org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.0-RC3
org.jetbrains.kotlin:kotlin-gradle-plugins-bom:2.0.0-RC3
org.jetbrains.kotlin:kotlin-klib-commonizer-api:2.0.0-RC3
org.jetbrains.kotlin:kotlin-native-utils:2.0.0-RC3
org.jetbrains.kotlin:kotlin-reflect:1.9.22
org.jetbrains.kotlin:kotlin-script-runtime:1.9.23
org.jetbrains.kotlin:kotlin-scripting-common:1.9.23
org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.9.23
org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.9.23
org.jetbrains.kotlin:kotlin-scripting-jvm:1.9.23
org.jetbrains.kotlin:kotlin-script-runtime:2.0.0-RC3
org.jetbrains.kotlin:kotlin-stdlib:1.9.22
org.jetbrains.kotlin:kotlin-tooling-core:1.9.23
org.jetbrains.kotlin:kotlin-util-io:1.9.23
org.jetbrains.kotlin:kotlin-util-klib:1.9.23
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.kotlin:kotlin-tooling-core:2.0.0-RC3
org.jetbrains.kotlin:kotlin-util-io:2.0.0-RC3
org.jetbrains.kotlin:kotlin-util-klib:2.0.0-RC3
org.jetbrains.kotlinx.binary-compatibility-validator:org.jetbrains.kotlinx.binary-compatibility-validator.gradle.plugin:0.15.0-Beta.2
org.jetbrains.kotlinx:binary-compatibility-validator:0.15.0-Beta.2
org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.0
org.jetbrains.kotlinx:kotlinx-html-jvm:0.8.1
org.jetbrains.kotlinx:kotlinx-metadata-jvm:0.6.2
Expand Down
Loading

0 comments on commit 3024e56

Please sign in to comment.