Merge pull request #1416 from robstoll/relocation-pom

add relocation pom for removing -en_GB
robstoll · Apr 28, 2023 · 5e4841e · 5e4841e
2 parents 128317a + 84b6a05
commit 5e4841e
Show file tree

Hide file tree

Showing 3 changed files with 63 additions and 12 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -81,7 +81,7 @@ val bundleSmokeTests = subprojects.asSequence().filter {
 val subprojectsWithoutToolProjects = subprojects - toolProjects
 val subprojectsWithoutToolAndSmokeTestProjects = subprojectsWithoutToolProjects - bundleSmokeTests
 
-extensions.getByType<ch.tutteli.gradle.plugins.dokka.DokkaPluginExtension>().apply {
+configure<ch.tutteli.gradle.plugins.dokka.DokkaPluginExtension> {
     modeSimple.set(false)
 }
 
@@ -127,7 +127,7 @@ configure(multiplatformProjects) {
             .allowedTestTasksWithoutTests.set(listOf("jsNodeTest"))
     }
 
-    extensions.getByType<KotlinMultiplatformExtension>().apply {
+    configure<KotlinMultiplatformExtension> {
         jvm {
             // for module-info.java and Java sources in test
             withJava()
@@ -187,7 +187,7 @@ configure(multiplatformProjects) {
     // needs to be in afterEvaluate for now because the tutteli-spek-plugin overwrites it by using useJunitPlatform which
     // apparently reconfigures the TestFramework (even if already useJunitPlatform was used, so it's more a setJUnitPlatformAsTestFramework)
     afterEvaluate {
-        project.extensions.getByType<KotlinMultiplatformExtension>().apply {
+        configure<KotlinMultiplatformExtension> {
             jvm {
                 testRuns["test"].executionTask.configure {
                     useJUnitPlatform {
@@ -258,13 +258,63 @@ configure(subprojectsWithoutToolAndSmokeTestProjects) {
     apply(plugin = "ch.tutteli.gradle.plugins.dokka")
     apply(plugin = "ch.tutteli.gradle.plugins.publish")
 
-    project.extensions.getByType<ch.tutteli.gradle.plugins.publish.PublishPluginExtension>().apply {
+    configure<ch.tutteli.gradle.plugins.publish.PublishPluginExtension> {
         resetLicenses("EUPL-1.2")
     }
+
+    val languageSuffixes = setOf("-en_GB", "-de_CH")
+    if (languageSuffixes.any { name.contains(it) }) {
+        configure<PublishingExtension> {
+            publications.withType<MavenPublication>()
+                .matching { !it.name.endsWith("-relocation") }
+                .all {
+                    val artifactIdBeforeLanguageRemoval = artifactId
+                    val artifactIdWithoutLanguage = languageSuffixes.fold(artifactId) { id, suffix ->
+                        id.replace(suffix, "")
+                    }
+
+                    // TODO 1.1.0 consider to remove en_GB from the project name
+                    artifactId = artifactIdWithoutLanguage
+
+                    //TODO 1.1.0 remove again, consider to rename the project-name and directory
+                    // we did not have a -metadata jar before, so no need for a relocation publication
+                    if (!artifactId.endsWith("metadata")) {
+                        val oldArtifactId = if (artifactIdBeforeLanguageRemoval == project.name) {
+                            "${project.name}-common"
+                        } else if (artifactId.endsWith("-jvm")) {
+                            project.name
+                        } else {
+                            artifactIdBeforeLanguageRemoval
+                        }
+
+                        println("old: $oldArtifactId, new: $artifactId")
+                        val pub = this
+                        publications.register<MavenPublication>("${pub.name}-relocation") {
+                            pom {
+                                // Old artifact coordinates
+                                groupId = pub.groupId
+                                artifactId = oldArtifactId
+                                version = pub.version
+
+                                distributionManagement {
+                                    relocation {
+                                        // New artifact coordinates
+                                        groupId.set(pub.groupId)
+                                        artifactId.set(artifactIdWithoutLanguage)
+                                        version.set(pub.version)
+                                        message.set("artifactId has changed, removed -en_GB as we drop support for a translated report and jvm has now the suffix -jvm and common no longer has the suffix -common")
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+        }
+    }
 }
 
 configure(subprojectsWithoutToolAndSmokeTestProjects) {
-    // we don't specify a module-info.java in specs (so far)
+// we don't specify a module-info.java in specs (so far)
     if (name != "atrium-specs") {
         apply(plugin = "ch.tutteli.gradle.plugins.kotlin.module.info")
     }

diff --git a/bundles/fluent-en_GB/atrium-fluent-en_GB/build.gradle.kts b/bundles/fluent-en_GB/atrium-fluent-en_GB/build.gradle.kts
@@ -9,7 +9,7 @@ kotlin {
                 api(prefixedProject("translations-en_GB"))
             }
         }
-        val jvmMain by getting{
+        val jvmMain by getting {
             dependencies {
                 api(prefixedProject("verbs"))
                 api(prefixedProject("api-fluent-en_GB"))

diff --git a/misc/tools/bc-tests/build.gradle.kts b/misc/tools/bc-tests/build.gradle.kts
@@ -173,7 +173,7 @@ bcConfigs.forEach { (oldVersion, apis, pair) ->
     }
 
     configure(listOf(project(":bc-tests:$oldVersion-specs"))) {
-        extensions.getByType<KotlinMultiplatformExtension>().apply {
+        configure<KotlinMultiplatformExtension> {
             jvm()
             js().nodejs {}
             sourceSets {
@@ -265,7 +265,7 @@ bcConfigs.forEach { (oldVersion, apis, pair) ->
             configure(listOf(project(":bc-tests:$oldVersion-api-$apiName-bbc"))) {
                 apply(plugin = "ch.tutteli.gradle.plugins.junitjacoco")
 
-                extensions.getByType<KotlinMultiplatformExtension>().apply {
+                configure<KotlinMultiplatformExtension> {
                     val confName = "confBbc"
 
                     jvm {
@@ -337,7 +337,7 @@ bcConfigs.forEach { (oldVersion, apis, pair) ->
 
             apply(plugin = "ch.tutteli.gradle.plugins.junitjacoco")
 
-            extensions.getByType<KotlinMultiplatformExtension>().apply {
+            configure<KotlinMultiplatformExtension> {
 
                 js().nodejs {}
 
@@ -453,15 +453,16 @@ fun Project.createJacocoReportTask(
                     project(":atrium-translations-de_CH")
                 )
             }
+
             else -> throw IllegalStateException("re-adjust jacoco task")
         }
         projects.forEach {
-            //TODO 1.1.0 simplify once all project use new MPP plugin
+            //TODO 1.1.0 simplify, all projects use now the new MPP plugin
             val sourceSetContainer = it.extensions.findByType<SourceSetContainer>()
             if (sourceSetContainer != null) {
                 sourceSets(sourceSetContainer["main"])
             } else {
-                it.extensions.getByType<KotlinMultiplatformExtension>().sourceSets.forEach { kotlinSourceSet ->
+                it.the<KotlinMultiplatformExtension>().sourceSets.forEach { kotlinSourceSet ->
                     sourceDirectories.from(kotlinSourceSet.kotlin.srcDirs)
                 }
             }
@@ -479,7 +480,7 @@ fun Project.createJacocoReportTask(
         }
     }
 
-    extensions.getByType<JacocoPluginExtension>().apply {
+    configure<JacocoPluginExtension> {
         toolVersion = jacocoToolVersion
         this.applyTo<JavaExec>(runTask)
     }