feat(jpms): add module-info.java descriptors

api/build.gradle

@@ -1,32 +1,74 @@
 description = "reactive-streams"
-def jdkFlow = false
+def isJdk9OrGreater = false
 try {
     Class.forName("java.util.concurrent.Flow")
-    jdkFlow = true
+    isJdk9OrGreater = true
 } catch (ClassNotFoundException cnfe) {
 
 }
 
 sourceSets {
     main {
         java {
-            if (jdkFlow)
-              srcDirs = ['src/main/java', 'src/main/java9']
-            else
-              srcDirs = ['src/main/java']
+            srcDirs = ['src/main/java']
         }
     }
+    if (isJdk9OrGreater) java9 {
+        java {
+            srcDirs = ['src/main/java', 'src/main/java9']
+        }
+    }
+}
+
+configurations {
+  mrjarArtifact
 }
 
 jar {
+    if (isJdk9OrGreater) into('META-INF/versions/9') {
+        from(sourceSets.java9.output) {
+            include '**/FlowAdapters*'
+            include '**/module-info.class'
+        }
+    }
+
     bnd ('Bundle-Name': 'reactive-streams-jvm',
             'Bundle-Vendor': 'Reactive Streams SIG',
             'Bundle-Description': 'Reactive Streams API',
             'Bundle-DocURL': 'http://reactive-streams.org',
             'Bundle-Version': project.version,
-            'Export-Package': 'org.reactivestreams.*',
-            'Automatic-Module-Name': 'org.reactivestreams',
-            'Bundle-SymbolicName': 'org.reactivestreams.reactive-streams'
+            'Export-Package': 'org.reactivestreams.*,!META-INF.*',
+            'Multi-Release': true,
+            'Bundle-SymbolicName': 'org.reactivestreams.reactive-streams',
+            '-fixupmessages': '^Classes found in the wrong directory: .*'
     )
 }
 
+artifacts { mrjarArtifact jar }
+
+compileJava {
+    group = "build"
+    description = "Compile Java 1.6 classes"
+}
+
+if (isJdk9OrGreater) {
+    compileJava9Java {
+        group = "build"
+        description = "Compile Java 9 classes for MR JAR"
+
+        sourceCompatibility = 9
+        targetCompatibility = 9
+    }
+
+    tasks.register('validateModularJar', Exec) {
+        dependsOn jar
+        inputs.file jar.outputs.files.asPath
+
+        executable = "jar"
+        args = ['--describe-module', '--file', jar.outputs.files.asPath]
+    }
+
+    tasks.check {
+        finalizedBy validateModularJar
+    }
+}

api/src/main/java9/module-info.java

@@ -0,0 +1,10 @@
+/***************************************************
+ * Licensed under MIT No Attribution (SPDX: MIT-0) *
+ ***************************************************/
+
+/**
+ * Reactive Streams
+ */
+module org.reactivestreams {
+  exports org.reactivestreams;
+}

build.gradle

@@ -11,15 +11,23 @@ buildscript {
     }
 }
 
+def sonatypeRepo = 'https://oss.sonatype.org/service/local/staging/deploy/maven2/'
+def sonatypeSnapshots = 'https://oss.sonatype.org/content/repositories/snapshots/'
+
+def distributionRepository = properties["distributionRepository"] ?: sonatypeRepo
+def snapshotsRepository = properties["snapshotsRepository"] ?: sonatypeSnapshots
+
 subprojects {
     apply plugin: "java-library"
     apply plugin: 'biz.aQute.bnd.builder'
 
     group = "org.reactivestreams"
     version = "1.0.4"
 
-    sourceCompatibility = 1.6
-    targetCompatibility = 1.6
+    tasks.compileJava {
+        sourceCompatibility = 1.6
+        targetCompatibility = 1.6
+    }
 
     tasks.withType(JavaCompile) {
         configure(options) {
@@ -53,14 +61,15 @@ subprojects {
                  "reactive-streams-tck",
                  "reactive-streams-tck-flow",
                  "reactive-streams-examples"]) {
-        apply plugin: "maven"
         apply plugin: "signing"
+        apply plugin: "publishing"
         apply plugin: "maven-publish"
 
         signing {
             sign configurations.archives
-            required { gradle.taskGraph.hasTask(uploadArchives) }
+            required { gradle.taskGraph.hasTask("publish") }
         }
+
         task sourcesJar(type: Jar) {
             classifier "sources"
             from sourceSets.main.allSource
@@ -79,41 +88,37 @@ subprojects {
           }
           repositories {
             mavenLocal()
+
+            gradle.taskGraph.whenReady { taskGraph ->
+              if (taskGraph.hasTask("publish")) {
+                  def userProp = "sonatypeOssUsername"
+                  def passwordProp = "sonatypeOssPassword"
+                  def user = project.properties[userProp]
+                  def password = project.properties[passwordProp]
+
+                  if ((user == null || password == null) && distributionRepository == sonatypeRepo) {
+                      throw new InvalidUserDataException(
+                         "Cannot perform $uploadArchives.path due to missing credentials.\n" +
+                         "Run with command line args `-P$userProp=«username» -P$passwordProp=«password»` or add these properties to $gradle.gradleUserHomeDir/gradle.properties.\n")
+                  }
+
+                  repository(url: distributionRepository) {
+                    authentication(userName: user, password: password)
+                  }
+                  if (sonatypeSnapshots != "") {
+                    snapshotRepository(url: snapshotsRepository) {
+                      authentication(userName: user, password: password)
+                    }
+                  }
+              }
+            }
           }
         }
 
         artifacts {
             archives sourcesJar, javadocJar
         }
 
-        uploadArchives {
-            repositories {
-                mavenDeployer {
-                    gradle.taskGraph.whenReady { taskGraph ->
-                        if (taskGraph.hasTask(uploadArchives)) {
-                            def userProp = "sonatypeOssUsername"
-                            def passwordProp = "sonatypeOssPassword"
-                            def user = project.properties[userProp]
-                            def password = project.properties[passwordProp]
-
-                            if (user == null || password == null) {
-                                throw new InvalidUserDataException(
-                                        "Cannot perform $uploadArchives.path due to missing credentials.\n" +
-                                        "Run with command line args `-P$userProp=«username» -P$passwordProp=«password»` or add these properties to $gradle.gradleUserHomeDir/gradle.properties.\n")
-                            }
-
-                            repository(url: "https://oss.sonatype.org/service/local/staging/deploy/maven2/") {
-                                authentication(userName: user, password: password)
-                            }
-                            snapshotRepository(url: "https://oss.sonatype.org/content/repositories/snapshots/") {
-                                authentication(userName: user, password: password)
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
         tasks.withType(Upload) {
             repositories.withType(MavenResolver) {
                 it.beforeDeployment { signing.signPom(it) }

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.4-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists