blowdryer-ed base/java8 and base/osgi

Author: nedtwigg

build.gradle

@@ -1,31 +1,15 @@
 plugins {
+	id "com.diffplug.blowdryer"
 	id "com.github.ben-manes.versions"
 	id "com.diffplug.gradle.osgi.bndmanifest"
 	id "com.diffplug.gradle.spotless"
 	id "com.jfrog.bintray"
 	id "com.github.spotbugs" version '3.0.0'
 }
 
-repositories {
-	mavenCentral()
-	// SNAPSHOT versions are free to rely on other SNAPSHOT libraries
-	if (project.version.endsWith('-SNAPSHOT')) {
-		maven {
-			url 'https://oss.sonatype.org/content/repositories/snapshots/'
-		}
-		configurations.all {
-			resolutionStrategy.cacheChangingModulesFor 0, 'seconds'
-		}
-	}
-}
-
-//////////
-// JAVA //
-//////////
 apply plugin: 'java-library'
-sourceCompatibility = VER_JAVA
-targetCompatibility = VER_JAVA
-
+apply from: 干.file('base/java8.gradle')
+apply from: 干.file('base/osgi.gradle')
 dependencies {
 	implementation "com.diffplug.durian:durian-core:${VER_DURIAN}"
 	implementation "com.diffplug.durian:durian-collect:${VER_DURIAN}"
@@ -36,41 +20,6 @@ dependencies {
 	testImplementation "com.diffplug.durian:durian-debug:${VER_DURIAN_DEBUG}"
 }
 
-//////////
-// OSGI //
-//////////
-jar.manifest.attributes (
-	'Bundle-SymbolicName': 'com.diffplug.durian.rx',
-	'Bundle-Description': project.description,
-	'Export-Package': 'com.diffplug.common.rx.*',
-	'Bundle-RequiredExecutionEnvironment': 'JavaSE-1.8',
-	'Bundle-Vendor': 'DiffPlug',
-	'Bundle-DocURL': "https://github.com/${project.org}/${project.name}",
-	'Bundle-License': "https://github.com/${project.org}/${project.name}/blob/v${project.version}/LICENSE",
-	'-removeheaders': 'Bnd-LastModified,Bundle-Name,Created-By,Tool',
-)
-// copy the manifest into the WC
-osgiBndManifest {
-	copyTo 'src/main/resources/META-INF/MANIFEST.MF'
-}
-
-/////////////
-// ECLIPSE //
-/////////////
-apply plugin: 'eclipse'
-eclipse {
-	classpath {
-		downloadSources true
-		downloadJavadoc true
-	}
-	jdt {
-		sourceCompatibility VER_JAVA
-		targetCompatibility VER_JAVA
-	}
-}
-// always create fresh projects
-tasks.eclipse.dependsOn(cleanEclipse)
-
 ////////////
 // FORMAT //
 ////////////
@@ -157,92 +106,3 @@ task javadocJar(type: Jar, dependsOn: javadoc) {
 	classifier = 'javadoc'
 	from javadoc.destinationDir
 }
-
-////////////////
-// PUBLISHING //
-////////////////
-def isSnapshot = project.version.endsWith('-SNAPSHOT')
-// pulls the credentials from either the environment variable or gradle.properties
-def cred = {
-	if (System.env[it] != null) {
-		return System.env[it]
-	} else if (project.hasProperty(it)) {
-		return project[it]
-	} else {
-		return 'unknown_' + it
-	}
-}
-
-publishing {
-	publications {
-		mavenJava(MavenPublication) {
-			from components.java
-			artifact sourcesJar
-			artifact javadocJar
-			pom.withXml {
-				// findbugs annotations should have scope "provided"
-				asNode().dependencies.'*'.findAll() { it.groupId.text() == 'com.google.code.findbugs' }.each() { it.scope*.value = 'provided' }
-				// add MavenCentral requirements to the POM
-				asNode().children().last() + {
-					resolveStrategy = Closure.DELEGATE_FIRST
-					name project.name
-					description project.description
-					url "https://github.com/${project.org}/${project.name}"
-					scm {
-						url "https://github.com/${project.org}/${project.name}"
-						connection "scm:git:git://github.com/${project.org}/${project.name}"
-						developerConnection "scm:git:ssh:[email protected]/${project.org}/${project.name}"
-					}
-					licenses {
-						license {
-							name 'The Apache Software License, Version 2.0'
-							url 'http://www.apache.org/license/LICENSE-2.0.txt'
-							distribution 'repo'
-						}
-					}
-					developers {
-						developer {
-							id 'nedtwigg'
-							name 'Ned Twigg'
-							email '[email protected]'
-						}
-					}
-				}
-			}
-		}
-	}
-	if (isSnapshot) {
-		// upload snapshots to oss.sonatype.org
-		repositories { maven {
-			url = 'https://oss.sonatype.org/content/repositories/snapshots'
-			credentials {
-				username = cred('nexus_user')
-				password = cred('nexus_pass')
-			}
-		} }
-	}
-}
-
-if (!isSnapshot) {
-	// upload releases to bintray and then mavenCentral
-	bintray {
-		user = cred('bintray_user')
-		key = cred('bintray_pass')
-		publications = ['mavenJava']
-		publish = true
-		pkg {
-			repo = 'opensource'
-			name = project.name
-			userOrg = project.org
-			version {
-				name = project.version
-				mavenCentralSync {
-					user = cred('nexus_user')
-					password = cred('nexus_pass')
-				}
-			}
-		}
-	}
-	publish.dependsOn(bintrayUpload)
-	bintrayUpload.dependsOn(['generatePomFileForMavenJavaPublication', jar, sourcesJar, javadocJar])
-}

gradle.properties

@@ -1,3 +1,9 @@
+maven_desc=DurianRx: Reactive getters, powered by RxJava and ListenableFuture
+git_url=https://github.com/diffplug/durian-rx
+osgi_symbolic_name=com.diffplug.durian.rx
+osgi_export=com.diffplug.common.rx.*
+license=apache
+
 stable=3.0.1
 version=3.0.1
 name=durian-rx