chore!: prepare for Kotlin 2.0, remove things that will be deleted, r…

…ename Unix common source set to Nix Signed-off-by: Art Shendrik <[email protected]>
fluxo-kt · May 18, 2024 · a90f7eb · a90f7eb
1 parent c644bd6
commit a90f7eb
Show file tree

Hide file tree

Showing 29 changed files with 114 additions and 354 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,13 @@
 
 [//]: # (Removed, Added, Changed, Fixed, Updated)
 
+### Removed
+- remove things that will be deleted in Kotlin 2.0.
+
+### Changed
+- prepare for Kotlin 2.0.
+- rename `Unix` common source set to `Nix`. **BREAKING CHANGE!**
+
 ### Updated
 - build(deps): bump Gradle from _8.6_ to _8.8-rc-1_.
 - bump com.mikepenz.aboutlibraries to _11.1.4_.

diff --git a/README.md b/README.md
@@ -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
@@ -110,19 +104,18 @@ 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 (Windows with limited set of POSIX APIs)
+                     |-- mingwX64
 ```
 
 

diff --git a/fluxo-kmp-conf/api/plugin.api b/fluxo-kmp-conf/api/plugin.api
@@ -40,11 +40,10 @@ public final class Fkc {
 	public static final fun getCommonMacos (Lorg/jetbrains/kotlin/gradle/plugin/KotlinSourceSetContainer;)Lfluxo/conf/kmp/SourceSetBundle;
 	public static final fun getCommonMingw (Lorg/jetbrains/kotlin/gradle/plugin/KotlinSourceSetContainer;)Lfluxo/conf/kmp/SourceSetBundle;
 	public static final fun getCommonNative (Lorg/jetbrains/kotlin/gradle/plugin/KotlinSourceSetContainer;)Lfluxo/conf/kmp/SourceSetBundle;
+	public static final fun getCommonNix (Lorg/jetbrains/kotlin/gradle/plugin/KotlinSourceSetContainer;)Lfluxo/conf/kmp/SourceSetBundle;
 	public static final fun getCommonNonJvm (Lorg/jetbrains/kotlin/gradle/plugin/KotlinSourceSetContainer;)Lfluxo/conf/kmp/SourceSetBundle;
 	public static final fun getCommonTvos (Lorg/jetbrains/kotlin/gradle/plugin/KotlinSourceSetContainer;)Lfluxo/conf/kmp/SourceSetBundle;
-	public static final fun getCommonUnix (Lorg/jetbrains/kotlin/gradle/plugin/KotlinSourceSetContainer;)Lfluxo/conf/kmp/SourceSetBundle;
 	public static final fun getCommonWasm (Lorg/jetbrains/kotlin/gradle/plugin/KotlinSourceSetContainer;)Lfluxo/conf/kmp/SourceSetBundle;
-	public static final fun getCommonWasmNative (Lorg/jetbrains/kotlin/gradle/plugin/KotlinSourceSetContainer;)Lfluxo/conf/kmp/SourceSetBundle;
 	public static final fun getCommonWatchos (Lorg/jetbrains/kotlin/gradle/plugin/KotlinSourceSetContainer;)Lfluxo/conf/kmp/SourceSetBundle;
 	public static final fun getDEFAULT_COMMON_JS_CONF ()Lkotlin/jvm/functions/Function1;
 	public static final fun getDarwinSet (Lorg/jetbrains/kotlin/gradle/plugin/KotlinSourceSetContainer;)Ljava/util/Set;
@@ -62,7 +61,6 @@ public final class Fkc {
 	public static final fun getValue (Lorg/gradle/api/provider/Provider;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 	public static final fun getValue (Lorg/gradle/api/provider/Provider;Ljava/lang/Object;Ljava/lang/Object;)Z
 	public static final fun getValueOrNull (Lorg/gradle/api/provider/Provider;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-	public static final fun getWasmNativeSet (Lorg/jetbrains/kotlin/gradle/plugin/KotlinSourceSetContainer;)Ljava/util/Set;
 	public static final fun getWatchosSet (Lorg/jetbrains/kotlin/gradle/plugin/KotlinSourceSetContainer;)Ljava/util/Set;
 	public static final fun iosCompat (Lorg/jetbrains/kotlin/gradle/dsl/KotlinMultiplatformExtension;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 	public static synthetic fun iosCompat$default (Lorg/jetbrains/kotlin/gradle/dsl/KotlinMultiplatformExtension;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)V
@@ -434,8 +432,9 @@ public abstract interface class fluxo/conf/dsl/container/Container : java/lang/C
 	public abstract fun applyPlugins ([Lorg/gradle/api/provider/Provider;)V
 }
 
-public abstract interface class fluxo/conf/dsl/container/KmpConfigurationContainerDsl : fluxo/conf/dsl/container/KotlinConfigurationContainerDsl, fluxo/conf/dsl/container/target/AndroidNativeTarget$Configure, fluxo/conf/dsl/container/target/AppleIosTarget$Configure, fluxo/conf/dsl/container/target/AppleMacosTarget$Configure, fluxo/conf/dsl/container/target/AppleTvosTarget$Configure, fluxo/conf/dsl/container/target/AppleWatchosTarget$Configure, fluxo/conf/dsl/container/target/JsTarget$Configure, fluxo/conf/dsl/container/target/LinuxTarget$Configure, fluxo/conf/dsl/container/target/MingwTarget$Configure, fluxo/conf/dsl/container/target/WasmNativeTarget$Configure, fluxo/conf/dsl/container/target/WasmTarget$Configure {
-	public abstract fun allDefaultTargets ()V
+public abstract interface class fluxo/conf/dsl/container/KmpConfigurationContainerDsl : fluxo/conf/dsl/container/KotlinConfigurationContainerDsl, fluxo/conf/dsl/container/target/AndroidNativeTarget$Configure, fluxo/conf/dsl/container/target/AppleIosTarget$Configure, fluxo/conf/dsl/container/target/AppleMacosTarget$Configure, fluxo/conf/dsl/container/target/AppleTvosTarget$Configure, fluxo/conf/dsl/container/target/AppleWatchosTarget$Configure, fluxo/conf/dsl/container/target/JsTarget$Configure, fluxo/conf/dsl/container/target/LinuxTarget$Configure, fluxo/conf/dsl/container/target/MingwTarget$Configure, fluxo/conf/dsl/container/target/WasmTarget$Configure {
+	public abstract fun allDefaultTargets (Z)V
+	public static synthetic fun allDefaultTargets$default (Lfluxo/conf/dsl/container/KmpConfigurationContainerDsl;ZILjava/lang/Object;)V
 	public abstract fun kotlinMultiplatform (Lkotlin/jvm/functions/Function1;)V
 }
 
@@ -488,8 +487,6 @@ public abstract interface class fluxo/conf/dsl/container/target/AppleIosTarget :
 public abstract interface class fluxo/conf/dsl/container/target/AppleIosTarget$Configure {
 	public fun ios (Lkotlin/jvm/functions/Function1;)V
 	public static synthetic fun ios$default (Lfluxo/conf/dsl/container/target/AppleIosTarget$Configure;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
-	public abstract fun iosArm32 (Ljava/lang/String;Lkotlin/jvm/functions/Function1;)V
-	public static synthetic fun iosArm32$default (Lfluxo/conf/dsl/container/target/AppleIosTarget$Configure;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 	public abstract fun iosArm64 (Ljava/lang/String;Lkotlin/jvm/functions/Function1;)V
 	public static synthetic fun iosArm64$default (Lfluxo/conf/dsl/container/target/AppleIosTarget$Configure;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 	public abstract fun iosSimulatorArm64 (Ljava/lang/String;Lkotlin/jvm/functions/Function1;)V
@@ -540,8 +537,6 @@ public abstract interface class fluxo/conf/dsl/container/target/AppleWatchosTarg
 	public static synthetic fun watchosSimulatorArm64$default (Lfluxo/conf/dsl/container/target/AppleWatchosTarget$Configure;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 	public abstract fun watchosX64 (Ljava/lang/String;Lkotlin/jvm/functions/Function1;)V
 	public static synthetic fun watchosX64$default (Lfluxo/conf/dsl/container/target/AppleWatchosTarget$Configure;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
-	public abstract fun watchosX86 (Ljava/lang/String;Lkotlin/jvm/functions/Function1;)V
-	public static synthetic fun watchosX86$default (Lfluxo/conf/dsl/container/target/AppleWatchosTarget$Configure;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 }
 
 public abstract interface class fluxo/conf/dsl/container/target/JsTarget : fluxo/conf/dsl/container/KotlinTargetContainer {
@@ -572,10 +567,6 @@ public abstract interface class fluxo/conf/dsl/container/target/LinuxTarget$Conf
 	public static synthetic fun linuxArm32Hfp$default (Lfluxo/conf/dsl/container/target/LinuxTarget$Configure;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 	public abstract fun linuxArm64 (Ljava/lang/String;Lkotlin/jvm/functions/Function1;)V
 	public static synthetic fun linuxArm64$default (Lfluxo/conf/dsl/container/target/LinuxTarget$Configure;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
-	public abstract fun linuxMips32 (Ljava/lang/String;Lkotlin/jvm/functions/Function1;)V
-	public static synthetic fun linuxMips32$default (Lfluxo/conf/dsl/container/target/LinuxTarget$Configure;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
-	public abstract fun linuxMipsel32 (Ljava/lang/String;Lkotlin/jvm/functions/Function1;)V
-	public static synthetic fun linuxMipsel32$default (Lfluxo/conf/dsl/container/target/LinuxTarget$Configure;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 	public abstract fun linuxX64 (Ljava/lang/String;Lkotlin/jvm/functions/Function1;)V
 	public static synthetic fun linuxX64$default (Lfluxo/conf/dsl/container/target/LinuxTarget$Configure;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 }
@@ -588,18 +579,6 @@ public abstract interface class fluxo/conf/dsl/container/target/MingwTarget$Conf
 	public static synthetic fun mingw$default (Lfluxo/conf/dsl/container/target/MingwTarget$Configure;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 	public abstract fun mingwX64 (Ljava/lang/String;Lkotlin/jvm/functions/Function1;)V
 	public static synthetic fun mingwX64$default (Lfluxo/conf/dsl/container/target/MingwTarget$Configure;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
-	public abstract fun mingwX86 (Ljava/lang/String;Lkotlin/jvm/functions/Function1;)V
-	public static synthetic fun mingwX86$default (Lfluxo/conf/dsl/container/target/MingwTarget$Configure;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
-}
-
-public abstract interface class fluxo/conf/dsl/container/target/WasmNativeTarget : fluxo/conf/dsl/container/KotlinTargetContainer {
-}
-
-public abstract interface class fluxo/conf/dsl/container/target/WasmNativeTarget$Configure {
-	public abstract fun wasm32 (Ljava/lang/String;Lkotlin/jvm/functions/Function1;)V
-	public static synthetic fun wasm32$default (Lfluxo/conf/dsl/container/target/WasmNativeTarget$Configure;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
-	public fun wasmNative (Lkotlin/jvm/functions/Function1;)V
-	public static synthetic fun wasmNative$default (Lfluxo/conf/dsl/container/target/WasmNativeTarget$Configure;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 }
 
 public abstract interface class fluxo/conf/dsl/container/target/WasmTarget : fluxo/conf/dsl/container/KotlinTargetContainer {

diff --git a/fluxo-kmp-conf/detekt-baseline.xml b/fluxo-kmp-conf/detekt-baseline.xml
@@ -17,7 +17,6 @@
     <ID>ForbiddenComment:AbstractShrinkerTask.kt$AbstractShrinkerTask$// TODO: Shared obfuscation dictionaries</ID>
     <ID>ForbiddenComment:AndroidTarget.kt$AndroidTarget$// FIXME: Implement API for source sets.</ID>
     <ID>ForbiddenComment:AndroidTarget.kt$AndroidTarget.Configure$// TODO: Detect applied plugin (lib/app) and use appropriate container?</ID>
-    <ID>ForbiddenComment:AppleIosTarget.kt$// FIXME: Public hierarchy of targets for easier configuration</ID>
     <ID>ForbiddenComment:ContainerImpl.kt$ContainerImpl$// TODO: Utilize version available from PluginDependency</ID>
     <ID>ForbiddenComment:DependencyAnalysisPlugin.kt$// TODO: no need to declare transitive dependencies for the final app module</ID>
     <ID>ForbiddenComment:DependencyGuardPlugin.kt$// TODO: Allow to customize configurations auto-filtration</ID>