Merge pull request #281 from LouisCAD/main

Prepare for release 3.0.0-beta04
LouisCAD · Jul 31, 2021 · 265fba3 · 265fba3
2 parents 08935f7 + 4d8b4c3
commit 265fba3
Show file tree

Hide file tree

Showing 19 changed files with 69 additions and 60 deletions.
diff --git a/.idea/copyright/Louis_CAD_Apache_2.xml b/.idea/copyright/Louis_CAD_Apache_2.xml
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Change log for Splitties
 
+## Version 3.0.0-beta04 (2021-07-30)
+
+Compiled with Kotlin 1.5.21 and kotlinx.coroutines 1.5.1-native-mt.
+
+### Fix
+
+Fix iOS/multiplatform publication (see [issue #280](https://github.com/LouisCAD/Splitties/issues/280)).
+
 ## Version 3.0.0-beta03 (2021-07-17)
 
 Compiled with Kotlin 1.5.21 and kotlinx.coroutines 1.5.1-native-mt.

diff --git a/README.md b/README.md
@@ -237,7 +237,7 @@ Includes the following modules:
 Gradle dependency:
 
 ```kotlin
-implementation("com.louiscad.splitties:splitties-fun-pack-android-base:3.0.0-beta03")
+implementation("com.louiscad.splitties:splitties-fun-pack-android-base:3.0.0-beta04")
 ```
 
 There's also a version with Views DSL. It additionally includes the following modules:
@@ -249,7 +249,7 @@ There's also a version with Views DSL. It additionally includes the following mo
 Gradle dependency:
 
 ```kotlin
-implementation("com.louiscad.splitties:splitties-fun-pack-android-base-with-views-dsl:3.0.0-beta03")
+implementation("com.louiscad.splitties:splitties-fun-pack-android-base-with-views-dsl:3.0.0-beta04")
 ```
 
 #### Android AppCompat
@@ -263,7 +263,7 @@ These 2 packs include the [Android base](#android-base) pack, and the following
 Gradle dependency:
 
 ```kotlin
-implementation("com.louiscad.splitties:splitties-fun-pack-android-appcompat:3.0.0-beta03")
+implementation("com.louiscad.splitties:splitties-fun-pack-android-appcompat:3.0.0-beta04")
 ```
 
 There's also a version with Views DSL. It additionally includes the Views DSL version of the
@@ -273,7 +273,7 @@ There's also a version with Views DSL. It additionally includes the Views DSL ve
 Gradle dependency:
 
 ```kotlin
-implementation("com.louiscad.splitties:splitties-fun-pack-android-appcompat-with-views-dsl:3.0.0-beta03")
+implementation("com.louiscad.splitties:splitties-fun-pack-android-appcompat-with-views-dsl:3.0.0-beta04")
 ```
 
 #### Android Material Components
@@ -289,7 +289,7 @@ These 2 packs include the [Android AppCompat](#android-appcompat) pack, and the
 Gradle dependency:
 
 ```kotlin
-implementation("com.louiscad.splitties:splitties-fun-pack-android-material-components:3.0.0-beta03")
+implementation("com.louiscad.splitties:splitties-fun-pack-android-material-components:3.0.0-beta04")
 ```
 
 There's also a version with Views DSL. It additionally includes the Views DSL version of the
@@ -300,7 +300,7 @@ There's also a version with Views DSL. It additionally includes the Views DSL ve
 Gradle dependency:
 
 ```kotlin
-implementation("com.louiscad.splitties:splitties-fun-pack-android-material-components-with-views-dsl:3.0.0-beta03")
+implementation("com.louiscad.splitties:splitties-fun-pack-android-material-components-with-views-dsl:3.0.0-beta04")
 ```
 
 #### All the artifacts (47)
@@ -311,7 +311,7 @@ into your root project `build.gradle` file:
 ```groovy
 allProjects {
     ext {
-        splitties_version = "3.0.0-beta03"
+        splitties_version = "3.0.0-beta04"
     }
 }
 ```

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2020 Louis Cognault Ayeva Derman. Use of this source code is governed by the Apache 2.0 license.
+ * Copyright 2019-2021 Louis Cognault Ayeva Derman. Use of this source code is governed by the Apache 2.0 license.
  */
 
 @file:Suppress("SpellCheckingInspection")
@@ -19,6 +19,10 @@ plugins {
     id("com.osacky.doctor")
 }
 
+doctor {
+    disallowCleanTaskDependencies.set(false)
+}
+
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 allprojects {

diff --git a/buildSrc/src/main/kotlin/dependencies/module dependencies shorthands.kt b/buildSrc/src/main/kotlin/dependencies/module dependencies shorthands.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Louis Cognault Ayeva Derman. Use of this source code is governed by the Apache 2.0 license.
+ * Copyright 2019-2021 Louis Cognault Ayeva Derman. Use of this source code is governed by the Apache 2.0 license.
  */
 
 @file:Suppress("PackageDirectoryMismatch")
@@ -8,5 +8,8 @@ import org.gradle.api.artifacts.dsl.DependencyHandler
 import org.gradle.kotlin.dsl.project
 import org.jetbrains.kotlin.gradle.plugin.KotlinDependencyHandler
 
-fun DependencyHandler.splitties(splitName: String) = project(":modules:$splitName")
-fun KotlinDependencyHandler.splitties(splitName: String) = project(":modules:$splitName")
+fun DependencyHandler.splitties(splitName: String) = project(":modules:splitties-$splitName")
+fun KotlinDependencyHandler.splitties(splitName: String) = project(":modules:splitties-$splitName")
+
+fun DependencyHandler.splittiesFunPack(funPackName: String) = project(":fun-packs:splitties-fun-pack-$funPackName")
+fun KotlinDependencyHandler.splittiesFunPack(funPackName: String) = project(":fun-packs:splitties-fun-pack-$funPackName")
diff --git a/buildSrc/src/main/kotlin/publishing/KotlinTargetsMavenPublications.kt b/buildSrc/src/main/kotlin/publishing/KotlinTargetsMavenPublications.kt
@@ -4,15 +4,9 @@
 
 @file:Suppress("PackageDirectoryMismatch")
 
-import org.gradle.api.Project
 import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType.androidJvm
-import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType.common
-import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType.js
-import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType.jvm
-import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType.native
 import org.jetbrains.kotlin.gradle.plugin.KotlinTarget
 import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinAndroidTarget
-import java.util.Locale
 
 fun KotlinTarget.configureMavenPublication(
     publishReleaseVariantOnly: Boolean = false
@@ -23,18 +17,7 @@ fun KotlinTarget.configureMavenPublication(
     }
     val isInMultiplatformModule = project.plugins.hasPlugin("org.jetbrains.kotlin.multiplatform")
     if (isInMultiplatformModule.not()) return // The mavenPublication block would not be run anyway.
-    val suffix = when (platformType) {
-        common -> "-metadata"
-        jvm -> "-jvm"
-        js -> "-js"
-        androidJvm -> "-android"
-        native -> "-${name.toLowerCase(Locale.ROOT)}"
-    }
     mavenPublication {
-        val prefix = if (project.isFunPack) "splitties-fun-pack" else "splitties"
-        project.afterEvaluate {
-            artifactId = "$prefix-${project.name}$suffix"
-        }
         if (publishReleaseVariantOnly && platformType == androidJvm) {
             // We disable metadata generation for Android publications, so the release variants can
             // be used for any buildType of the consumer projects without having to specify
@@ -56,5 +39,3 @@ fun KotlinTarget.configureMavenPublication(
         }
     }
 }
-
-val Project.isFunPack: Boolean get() = parent?.name == "fun-packs"
diff --git a/buildSrc/src/main/kotlin/publishing/publish.gradle.kts b/buildSrc/src/main/kotlin/publishing/publish.gradle.kts
@@ -25,12 +25,6 @@ publishing {
         artifact(project.tasks.emptyJavadocJar())
         setupPom()
     }
-    mavenPublications.findByName("kotlinMultiplatform")?.let {
-        val prefix = if (project.isFunPack) "splitties-fun-pack" else "splitties"
-        project.afterEvaluate {
-            it.artifactId = "$prefix-${project.name}"
-        }
-    }
     repositories {
         mavenCentralStaging(
             project = project,

diff --git a/docs/DocsCopier.main.kts b/docs/DocsCopier.main.kts
@@ -35,7 +35,7 @@ val docsDir = projectDir.resolve("docs")
 // Regex inspired by http://blog.michaelperrin.fr/2019/02/04/advanced-regular-expressions/
 // If needed, look at the article again to support nested brackets (not needed so far).
 //language=RegExp
-val linksRegex = """\[(?<text>.+)\]\((?<url>[^) ]+)(?: \"(?<title>.+)\")?\)""".toRegex()
+val linksRegex = """\[(?<text>.+)\]\((?<url>[^) ]+)(?: "(?<title>.+)")?\)""".toRegex()
 val gitMainBranchUrl = "https://github.com/LouisCAD/Splitties/tree/main"
 
 suspend fun readTextWithAdaptationForMkDocs(sourceFile: File): String = Dispatchers.Default {

diff --git a/fun-packs/android-appcompat-with-views-dsl/build.gradle.kts b/fun-packs/android-appcompat-with-views-dsl/build.gradle.kts
@@ -20,8 +20,8 @@ kotlin {
     configure(targets) { configureMavenPublication() }
     sourceSets {
         androidMain.dependencies {
-            api(project(":fun-packs:android-appcompat"))
-            api(project(":fun-packs:android-base-with-views-dsl"))
+            api(splittiesFunPack("android-appcompat"))
+            api(splittiesFunPack("android-base-with-views-dsl"))
             api(splitties("views-dsl-appcompat"))
         }
     }

diff --git a/fun-packs/android-appcompat/build.gradle.kts b/fun-packs/android-appcompat/build.gradle.kts
@@ -20,7 +20,7 @@ kotlin {
     configure(targets) { configureMavenPublication() }
     sourceSets {
         androidMain.dependencies {
-            api(project(":fun-packs:android-base"))
+            api(splittiesFunPack("android-base"))
             listOf(
                 "alertdialog-appcompat",
                 "alertdialog-appcompat-coroutines",

diff --git a/fun-packs/android-base-with-views-dsl/build.gradle.kts b/fun-packs/android-base-with-views-dsl/build.gradle.kts
@@ -20,7 +20,7 @@ kotlin {
     configure(targets) { configureMavenPublication() }
     sourceSets {
         androidMain.dependencies {
-            api(project(":fun-packs:android-base"))
+            api(splittiesFunPack("android-base"))
             listOf(
                 "views-dsl",
                 "views-dsl-constraintlayout",

diff --git a/fun-packs/android-material-components-with-views-dsl/build.gradle.kts b/fun-packs/android-material-components-with-views-dsl/build.gradle.kts
@@ -20,8 +20,8 @@ kotlin {
     configure(targets) { configureMavenPublication() }
     sourceSets {
         androidMain.dependencies {
-            api(project(":fun-packs:android-material-components"))
-            api(project(":fun-packs:android-appcompat-with-views-dsl"))
+            api(splittiesFunPack("android-material-components"))
+            api(splittiesFunPack("android-appcompat-with-views-dsl"))
             listOf(
                 "views-dsl-coordinatorlayout",
                 "views-dsl-material"

diff --git a/fun-packs/android-material-components/build.gradle.kts b/fun-packs/android-material-components/build.gradle.kts
@@ -20,7 +20,7 @@ kotlin {
     configure(targets) { configureMavenPublication() }
     sourceSets {
         androidMain.dependencies {
-            api(project(":fun-packs:android-appcompat"))
+            api(splittiesFunPack("android-appcompat"))
             listOf(
                 "alertdialog-material",
                 "material-lists",

diff --git a/libraries_version.txt b/libraries_version.txt
@@ -1 +1 @@
-3.0.0-beta03
+3.0.0-beta04
diff --git a/samples/android-app/build.gradle.kts b/samples/android-app/build.gradle.kts
@@ -67,7 +67,7 @@ kotlin {
             api(Kotlin.stdlib.common)
         }
         androidMain.dependencies {
-            implementation(project(":fun-packs:android-material-components-with-views-dsl"))
+            implementation(splittiesFunPack("android-material-components-with-views-dsl"))
             arrayOf(
                 "arch-lifecycle",
                 "arch-room",

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -31,7 +31,7 @@ include {
     "samples" {
         "android-app"()
     }
-    "fun-packs" {
+    "fun-packs"(childrenPrefix = "splitties-fun-pack-") {
         "android-base"()
         "android-base-with-views-dsl"()
         "android-appcompat"()
@@ -47,7 +47,7 @@ include {
 
     if (checkPublication) "tools" { "publication-checker"() }
 
-    "modules" {
+    "modules"(childrenPrefix = "splitties-") {
         "activities"()
         "alertdialog"()
         "alertdialog-appcompat"()
@@ -104,18 +104,28 @@ include {
 //region include DSL
 class ModuleParentScope(
     private val name: String,
-    private val parent: ModuleParentScope? = null
+    private val parent: ModuleParentScope? = null,
+    private val prefix: String
 ) {
 
-    operator fun String.invoke(block: (ModuleParentScope.() -> Unit)? = null) {
+    operator fun String.invoke(
+        childrenPrefix: String = "",
+        block: (ModuleParentScope.() -> Unit)? = null
+    ) {
         check(startsWith(':').not())
         val moduleName = ":$this"
         val projectName = "$parentalPath$moduleName"
         include(projectName)
+        if (prefix.isNotEmpty()) {
+            project(projectName).let {
+                it.name = "$prefix${it.name}"
+            }
+        }
         block?.let { buildNode ->
             ModuleParentScope(
                 name = moduleName,
-                parent = this@ModuleParentScope
+                parent = this@ModuleParentScope,
+                prefix = childrenPrefix
             ).buildNode()
         }
     }
@@ -126,7 +136,7 @@ class ModuleParentScope(
 
 }
 
-inline fun include(block: ModuleParentScope.() -> Unit) {
-    ModuleParentScope("").block()
+inline fun include(prefix: String = "", block: ModuleParentScope.() -> Unit) {
+    ModuleParentScope(name = "", prefix = prefix).block()
 }
 //endregion
diff --git a/tools/publication-checker/build.gradle.kts b/tools/publication-checker/build.gradle.kts
@@ -76,7 +76,7 @@ kotlin {
             val sourceSet: KotlinSourceSet = target.mainSourceSet
             if (splitTargets.any { it.targetsSamePlatformAs(target) }) {
                 sourceSet.dependencies {
-                    implementation("$group:splitties-${project.name}") {
+                    implementation("$group:${project.name}") {
                         version { strictly(version) }
                     }
                 }
@@ -93,7 +93,7 @@ kotlin {
             val sourceSet: KotlinSourceSet = target.mainSourceSet
             if (splitTargets.any { it.targetsSamePlatformAs(target) }) {
                 sourceSet.dependencies {
-                    implementation("$group:splitties-fun-pack-${project.name}") {
+                    implementation("$group:${project.name}") {
                         version { strictly(version) }
                     }
                 }

diff --git a/versions.properties b/versions.properties
@@ -28,16 +28,20 @@ plugin.android=4.2.2
 ## # available=7.0.0-beta03
 ## # available=7.0.0-beta04
 ## # available=7.0.0-beta05
+## # available=7.0.0-rc01
+## # available=7.0.0
 ## # available=7.1.0-alpha01
 ## # available=7.1.0-alpha02
 ## # available=7.1.0-alpha03
+## # available=7.1.0-alpha04
+## # available=7.1.0-alpha05
 
-plugin.com.osacky.doctor=0.7.0
+plugin.com.osacky.doctor=0.7.1
 
 version.androidx.annotation=1.2.0
 ##              # available=1.3.0-alpha01
 
-version.androidx.appcompat=1.3.0
+version.androidx.appcompat=1.3.1
 ##             # available=1.4.0-alpha01
 ##             # available=1.4.0-alpha02
 ##             # available=1.4.0-alpha03
@@ -68,17 +72,19 @@ version.androidx.constraintlayout=1.1.3
 ##                    # available=2.1.0-alpha2
 ##                    # available=2.1.0-beta01
 ##                    # available=2.1.0-beta02
+##                    # available=2.1.0-rc01
 
 version.androidx.coordinatorlayout=1.1.0
 
 version.androidx.core=1.6.0
 ##        # available=1.7.0-alpha01
 
-version.androidx.fragment=1.3.5
+version.androidx.fragment=1.3.6
 ##            # available=1.4.0-alpha01
 ##            # available=1.4.0-alpha02
 ##            # available=1.4.0-alpha03
 ##            # available=1.4.0-alpha04
+##            # available=1.4.0-alpha05
 
 version.androidx.lifecycle=2.3.1
 ##             # available=2.4.0-alpha01
@@ -90,10 +96,12 @@ version.androidx.room=2.3.0
 ##        # available=2.4.0-alpha01
 ##        # available=2.4.0-alpha02
 ##        # available=2.4.0-alpha03
+##        # available=2.4.0-alpha04
 
 version.androidx.startup=1.0.0
 ##           # available=1.1.0-alpha01
 ##           # available=1.1.0-beta01
+##           # available=1.1.0-rc01
 
 version.androidx.test=1.4.0
 
@@ -111,6 +119,7 @@ version.google.android.material=1.4.0
 ##                  # available=1.5.0-alpha01
 
 version.kotlin=1.5.21
+## # available=1.5.30-M1
 
 version.kotlinx.coroutines=1.5.1-native-mt
 ##             # available=1.5.1