Merge remote-tracking branch 'origin/master' into develop

elizarov · elizarov · commit a36635a00100 · 2020-10-09T18:12:00.000+03:00
diff --git a/atomicfu/build.gradle b/atomicfu/build.gradle
@@ -297,7 +297,8 @@ jvmTest.dependsOn jvmTestAll
 
 afterEvaluate {
     publishing.publications {
-        metadata.artifactId = 'atomicfu-common'
+        if (kotlin_version < '1.4.20-M2')
+            metadata.artifactId = 'atomicfu-common'
 
         kotlinMultiplatform {
             apply from: "$rootDir/gradle/publish-mpp-root-module-in-platform.gradle"
@@ -306,6 +307,6 @@ afterEvaluate {
     }
 }
 
-tasks.matching { it.name == "generatePomFileForKotlinMultiplatformPublication"}.configureEach {
+tasks.matching { it.name == "generatePomFileForKotlinMultiplatformPublication" }.configureEach {
     dependsOn(tasks["generatePomFileForJvmPublication"])
 }

Original file line number	Diff line number	Diff line change
`@@ -297,7 +297,8 @@ jvmTest.dependsOn jvmTestAll`
`297`	`297`
`298`	`298`	`afterEvaluate {`
`299`	`299`	`publishing.publications {`
`300`		`- metadata.artifactId = 'atomicfu-common'`
	`300`	`+ if (kotlin_version < '1.4.20-M2')`
	`301`	`+ metadata.artifactId = 'atomicfu-common'`
`301`	`302`
`302`	`303`	`kotlinMultiplatform {`
`303`	`304`	`apply from: "$rootDir/gradle/publish-mpp-root-module-in-platform.gradle"`
`@@ -306,6 +307,6 @@ afterEvaluate {`
`306`	`307`	`}`
`307`	`308`	`}`
`308`	`309`
`309`		`-tasks.matching { it.name == "generatePomFileForKotlinMultiplatformPublication"}.configureEach {`
	`310`	`+tasks.matching { it.name == "generatePomFileForKotlinMultiplatformPublication" }.configureEach {`
`310`	`311`	`dependsOn(tasks["generatePomFileForJvmPublication"])`
`311`	`312`	`}`