Merge pull request #1112 from aol/cyclops17

chore: Upgrade to Gradle 7.2
aol · May 13, 2022 · 4c185f3 · 4c185f3
2 parents 6efc8b1 + de74896
commit 4c185f3
Show file tree

Hide file tree

Showing 26 changed files with 311 additions and 734 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,20 +1,16 @@
-buildscript {
-  repositories {
-    jcenter()
-  }
-
-  dependencies {
-    classpath 'com.bmuschko:gradle-nexus-plugin:2.2'
-  }
-}
-
 plugins {
-  id 'me.champeau.gradle.jmh' version '0.2.0'
+    id "me.champeau.jmh" version "0.6.5"
+    id 'maven-publish'
+    id 'signing'
+}
+repositories {
+    mavenCentral()
 }
 
-def custom = { "$rootDir/gradle/${it}.gradle" } //find custom plugins locally
-
-
+dependencies {
+    jmh 'org.openjdk.jmh:jmh-core:1.29'
+    jmh 'org.openjdk.jmh:jmh-generator-annprocess:1.28'
+}
 
 jar {
   manifest {
@@ -23,28 +19,127 @@ jar {
 }
 
 
+
 subprojects {
+    apply plugin: 'me.champeau.jmh'
+    apply plugin: 'java-library'
+    apply plugin: 'maven-publish'
+    apply plugin: 'signing'
+
+    group 'com.oath.cyclops'
+//  sourceCompatibility = 1.8
+//  targetCompatibility = 1.8
 
-  sourceCompatibility = 1.8
-  targetCompatibility = 1.8
-  if (JavaVersion.current().isJava8Compatible()) {
-    allprojects {
-      tasks.withType(Javadoc) {
-        options.addStringOption('Xdoclint:none', '-quiet')
-      }
+    java {
+        withJavadocJar()
+        withSourcesJar()
+
+        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_1_8
+    }
+    /**
+    signing {
+        sign publishing.publications.mavenJava
     }
-  }
 
-}
+ **/
+    if (JavaVersion.current().isJava8Compatible()) {
+        allprojects {
+            tasks.withType(Javadoc) {
+                options.addStringOption('Xdoclint:none', '-quiet')
+            }
+        }
+    }
+    javadoc {
+        if(JavaVersion.current().isJava9Compatible()) {
+            options.addBooleanOption('html5', true)
+        }
+    }
+    artifacts {
+        archives javadocJar, sourcesJar
+    }
+    signing {
+        sign configurations.archives
+    }
+    dependencies {
+        compileOnly "org.projectlombok:lombok:${lombokVersion}"
+        annotationProcessor "org.projectlombok:lombok:${lombokVersion}"
 
-task wrapper(type: Wrapper) {
-  gradleVersion = '2.14.1'
-}
+        // Test Dependencies
+        testCompileOnly "org.projectlombok:lombok:${lombokVersion}"
+        testAnnotationProcessor "org.projectlombok:lombok:${lombokVersion}"
+    }
+    publishing {
+        publications {
+            mavenJava(MavenPublication) {
+                from components.java
+                version "$version"
+                pom {
+                    name = POM_NAME
+                    packaging = POM_PACKAGING
+                    description = POM_DESCRIPTION
+                    url = POM_URL
+                    scm {
+                        url = 'scm:[email protected]:aol/cyclops-react.git'
+                        connection = 'scm:[email protected]:aol/cyclops-react.git'
+                        developerConnection = 'scm:[email protected]:aol/simple-react.git'
+                    }
 
+                    licenses {
+                        license {
+                            name = 'The Apache Software License, Version 2.0'
+                            url = 'http://www.apache.org/licenses/LICENSE-2.0.txt'
+                            distribution = 'repo'
+                        }
+                    }
+
+
+                    developers {
+                        developer {
+                            id = 'johnmcclean-aol'
+                            name = 'John McClean'
+                            email = '[email protected]'
+                        }
+                        developer {
+                            id = 'kewangie'
+                            name = 'Ke Wang'
+                            email = '[email protected]'
+                        }
+
+                        developer {
+                            id = 'tkountis'
+                            name = 'Thomas Kountis Wang'
+                            email = '[email protected]'
+                        }
+                        developer {
+                            id = 'colinfkennedy'
+                            name = 'Colin Kennedy'
+                            email = '[email protected]'
+                        }
+                    }
+                }
+            }
+        }
+        repositories {
+            mavenLocal()
+            maven {
+                url = 'https://oss.sonatype.org/service/local/staging/deploy/maven2'
+                credentials {
+                    username = nexusUsername
+                    password = nexusPassword
+                }
+            }
+        }
+
+    }
+}
+/**
 allprojects {
-    tasks.withType(JavaCompile).configureEach {
+    tasks.withType(JavaCompile) {
         options.fork = true
         options.incremental = true
     }
 
 }
+
+ **/
diff --git a/cyclops-anym/build.gradle b/cyclops-anym/build.gradle
@@ -12,7 +12,7 @@ buildscript {
 
 apply plugin: 'java'
 apply plugin: 'maven-publish'
-apply plugin: 'com.bmuschko.nexus'
+
 
 sourceCompatibility = 1.8
 jar {
@@ -25,26 +25,20 @@ repositories {
     mavenCentral()
     jcenter()
 }
-configurations {
-  provided
-}
+
 dependencies {
-  compile project(':cyclops')
-  compile project(':cyclops-futurestream')
-    compile project(':cyclops-reactive-collections')
-  compile project(':cyclops-pure')
-  provided 'org.projectlombok:lombok:1.16.20'
-  testCompile project(':cyclops').sourceSets.test.output
-  testCompile 'io.projectreactor:reactor-core:3.0.7.RELEASE'
-  testCompile group: 'junit', name: 'junit', version: '4.12'
-  testCompile 'org.hamcrest:hamcrest-all:1.3'
-  testCompile 'com.github.stefanbirkner:system-rules:1.10.0'
-}
-sourceSets {
-  main.compileClasspath += [configurations.provided]
-  test.compileClasspath += [configurations.provided]
-  test.runtimeClasspath += [configurations.provided]
+    api project(':cyclops')
+    api project(':cyclops-futurestream')
+    api project(':cyclops-reactive-collections')
+    api project(':cyclops-pure')
+    compileOnly 'org.projectlombok:lombok:1.16.20'
+    testImplementation project(':cyclops').sourceSets.test.output
+    testImplementation 'io.projectreactor:reactor-core:3.0.7.RELEASE'
+    testImplementation group: 'junit', name: 'junit', version: '4.12'
+    testImplementation 'org.hamcrest:hamcrest-all:1.3'
+    testImplementation 'com.github.stefanbirkner:system-rules:1.10.0'
 }
+
 task packageTests(type: Jar) {
     from sourceSets.test.output
     classifier = 'tests'
@@ -59,66 +53,5 @@ test {
 
 artifacts.archives packageTests
 
-modifyPom {
-  project {
-    name 'cyclops-anym'
-    description 'A higher kinded monad abstraction for Java'
-    url 'https://github.com/aol/cyclops-react'
-    inceptionYear '2015'
-
-    groupId 'com.oath.cyclops'
-    artifactId 'cyclops-anym'
-    version "$version"
-
-    scm {
-      url 'scm:[email protected]:aol/cyclops-react.git'
-      connection 'scm:[email protected]:aol/cyclops-react.git'
-      developerConnection 'scm:[email protected]:aol/simple-react.git'
-    }
-
-    licenses {
-      license {
-        name 'The Apache Software License, Version 2.0'
-        url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
-        distribution 'repo'
-      }
-    }
-
-    developers {
-      developer {
-        id 'johnmcclean'
-        name 'John McClean'
-        email '[email protected]'
-      }
-      developer {
-        id 'kewangie'
-        name 'Ke Wang'
-        email '[email protected]'
-      }
 
-      developer {
-        id 'tkountis'
-        name 'Thomas Kountis Wang'
-        email '[email protected]'
-      }
-      developer {
-        id 'colinfkennedy'
-        name 'Colin Kennedy'
-        email '[email protected]'
-      }
-    }
-  }
-}
-
-extraArchive {
-  sources = true
-  tests = true
-  javadoc = true
-}
-
-nexus {
-  sign = true
-  repositoryUrl = 'https://oss.sonatype.org/service/local/staging/deploy/maven2'
-  snapshotRepositoryUrl = 'https://oss.sonatype.org/content/repositories/snapshots'
-}
 
diff --git a/cyclops-anym/gradle.properties b/cyclops-anym/gradle.properties
@@ -0,0 +1 @@
+POM_NAME=cyclops-anym