Gradle version 5.6.1

* Gradle metadata format version 1.0 (stable)
* Using Gradle publish task for publishing
* Skip publishing to NPM when auth token is not set

Fixes #70

Author: elizarov

atomicfu-gradle-plugin/src/main/kotlin/kotlinx/atomicfu/plugin/gradle/AtomicFUGradlePlugin.kt

@@ -345,8 +345,7 @@ fun AtomicFUTransformJsTask.configureJsTask(
         verbose = config.verbose
     }
 
-fun Jar.setupJarManifest(multiRelease: Boolean, classifier: String = "") {
-    this.classifier = classifier // todo: why we overwrite jar's classifier?
+fun Jar.setupJarManifest(multiRelease: Boolean) {
     if (multiRelease) {
         manifest.attributes.apply {
             put("Multi-Release", "true")

atomicfu-gradle-plugin/src/test/kotlin/kotlinx/atomicfu/plugin/gradle/BaseKotlinGradleTest.kt

@@ -21,6 +21,9 @@ abstract class BaseKotlinGradleTest {
         val projectDir = workingDir.resolve(name).apply { mkdirs() }
         originalProjectDir.listFiles().forEach { it.copyRecursively(projectDir.resolve(it.name)) }
 
+        // Add an empty setting.gradle
+        projectDir.resolve("settings.gradle").writeText("// this file is intentionally left empty")
+
         Project(projectDir = projectDir).fn()
     }
 }

atomicfu-native/build.gradle

@@ -4,4 +4,4 @@
 
 // this is a kludge so that existing YouTrack config works, todo: remove
 // Deploy configurations run :atomicfu-native:bintrayUpload
-task bintrayUpload(dependsOn: ':atomicfu:bintrayUpload')
+task bintrayUpload(dependsOn: ':atomicfu:publish')

atomicfu/build.gradle

@@ -232,9 +232,5 @@ afterEvaluate {
         js.artifactId = 'atomicfu-js'
         metadata.artifactId = 'atomicfu-common'
         kotlinMultiplatform.artifactId = 'atomicfu-native'
-
-        configure([metadata, jvm, js]) { pub ->
-            pub.moduleDescriptorGenerator = null
-        }
     }
 }

build.gradle

@@ -37,7 +37,6 @@ buildscript {
     dependencies {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "com.moowork.gradle:gradle-node-plugin:$gradle_node_version"
-        classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:$bintray_version"
     }
 }
 
@@ -90,4 +89,4 @@ if (build_snapshot_train) {
 }
 
 // main deployment task
-task deploy(dependsOn: getTasksByName("bintrayUpload", true) + getTasksByName("publishNpm", true))
+task deploy(dependsOn: getTasksByName("publish", true) + getTasksByName("publishNpm", true))

gradle.properties

@@ -6,9 +6,6 @@ asm_version=5.2
 slf4j_version=1.8.0-alpha2
 junit_version=4.12
 
-# This is a specially built version from kotlin-native-dependencies repo that supports Gradle 4.10
-bintray_version=1.8.4-jetbrains-5
-
 maven_version=3.5.3
 
 gradle_node_version=1.2.0

gradle/publish-bintray.gradle

@@ -6,92 +6,76 @@
 
 apply plugin: 'maven'
 apply plugin: 'maven-publish'
-apply plugin: 'com.jfrog.bintray'
 
 apply from: project.rootProject.file('gradle/maven-central.gradle')
 
 // todo: figure out how we can check it in a generic way
 def isMultiplatform = project.name == 'atomicfu'
 
-// ------------- tasks
-
-// workaround for tasks created by native plugin
 if (!isMultiplatform) {
+    // Regular java modules need 'java-library' plugin for proper publication
+    apply plugin: 'java-library'
+
+    // MPP projects pack their sources automtically, java libraries need to explicitly pack them
     task sourcesJar(type: Jar) {
-        classifier = 'sources'
+        archiveClassifier = 'sources'
         from "src/main/kotlin"
     }
-
-    // empty xxx-javadoc.jar
-    task javadocJar(type: Jar) {
-        classifier = 'javadoc'
-        from "$buildDir/javadoc" // would not exist
-    }
 }
 
-task stubSources(type: Jar) {
-    classifier = 'sources'
-}
-
-task stubJavadoc(type: Jar) {
-    classifier = 'javadoc'
+// empty xxx-javadoc.jar
+task javadocJar(type: Jar) {
+    archiveClassifier = 'javadoc'
 }
 
 publishing {
     repositories {
-        maven { url = 'https://kotlin.bintray.com/kotlinx' }
-    }
-    publications.all {
-        pom.withXml(configureMavenCentralMetadata)
-    }
+        maven {
+            def user = 'kotlin'
+            def repo = 'kotlinx'
+            def name = 'kotlinx.atomicfu'
+            url = "https://api.bintray.com/maven/$user/$repo/$name/;publish=0"
 
+            credentials {
+                username = project.hasProperty('bintrayUser') ? project.property('bintrayUser') : System.getenv('BINTRAY_USER')
+                password = project.hasProperty('bintrayApiKey') ? project.property('bintrayApiKey') : System.getenv('BINTRAY_API_KEY')
+            }
+        }
+    }
+    
     if (!isMultiplatform) {
+        // Configure java publications for non-MPP projects
         publications {
-            maven(MavenPublication) {
-                from components.java
-                artifact sourcesJar
-                artifact javadocJar
-
-                if (project.name.endsWith("-maven-plugin")) {
-                    pom.packaging = 'maven-plugin'
+            // plugin configures its own publication pluginMaven
+            if (project.name == 'atomicfu-gradle-plugin') {
+                pluginMaven(MavenPublication) {
+                    artifact sourcesJar
                 }
-            }
-        }
-    } else {
-        afterEvaluate {
-            kotlin.targets.forEach { target ->
-                def targetPublication = publications.findByName(target.name)
-                if (targetPublication != null) {
-                    targetPublication.artifact stubJavadoc
+            } else {
+                maven(MavenPublication) {
+                    from components.java
+                    artifact sourcesJar
+
+                    if (project.name.endsWith("-maven-plugin")) {
+                        pom.packaging = 'maven-plugin'
+                    }
                 }
             }
         }
     }
-}
 
-bintray {
-    user = project.hasProperty('bintrayUser') ? project.property('bintrayUser') : System.getenv('BINTRAY_USER')
-    key = project.hasProperty('bintrayApiKey') ? project.property('bintrayApiKey') : System.getenv('BINTRAY_API_KEY')
-    override = true // for multi-platform Kotlin/Native publishing
-    pkg {
-        userOrg = 'kotlin'
-        repo = 'kotlinx'
-        name = 'kotlinx.atomicfu'
-        version {
-            name = project.version
-            vcsTag = project.version
-            released  = new Date()
-        }
-    }
-}
+    publications.all {
+        pom.withXml(configureMavenCentralMetadata)
 
-// TODO :kludge this is required for K/N publishing
-bintrayUpload.dependsOn publishToMavenLocal
+        // add empty javadocs (no need for MPP root publication which publishes only pom file)
+        if (it.name != 'kotlinMultiplatform') {
+            it.artifact(javadocJar)
+        }
 
-// This is for easier debugging of bintray uploading problems
-bintrayUpload.doFirst {
-    publications = project.publishing.publications.findAll { !it.name.contains('-test') }.collect {
-        println("Uploading artifact '$it.groupId:$it.artifactId:$it.version' from publication '$it.name'")
-        it
+        // disable metadata everywhere, but in native modules
+        def type = it.name
+        if (type == 'maven' || type == 'metadata' || type == 'jvm' || type == 'js' || type == 'pluginMaven') {
+            moduleDescriptorGenerator = null
+        }
     }
-}
+}

gradle/publish-npm-js.gradle

@@ -29,7 +29,7 @@ task preparePublishNpm(type: Copy, dependsOn: [compileKotlinJs]) {
     into npmDeployDir
 }
 
-task publishNpm(type: NpmTask, dependsOn: [preparePublishNpm]) {
+task performPublishNpm(type: NpmTask, dependsOn: [preparePublishNpm]) {
     workingDir = npmDeployDir
     def deployArgs = ['publish',
                       "--//registry.npmjs.org/:_authToken=$authToken",
@@ -42,4 +42,17 @@ task publishNpm(type: NpmTask, dependsOn: [preparePublishNpm]) {
             args = deployArgs
         }
     }
+
+    if (authToken == "") {
+        enabled = false // skip npm publishing when token is not set
+    }
+}
+
+task publishNpm(dependsOn: performPublishNpm) {
+    doFirst {
+        if (!performPublishNpm.enabled) {
+            println("NOTE: publishNpm is skipped because 'kotlin.npmjs.auth.token' is not set")
+        }
+    }
 }
+

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,5 @@
-#Tue Jul 02 20:11:54 MSK 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.1-all.zip