Moves to nebula.netflixoss 2.2.5

Netflix · Jan 31, 2015 · ee4fe40 · ee4fe40
1 parent 3c0da6f
commit ee4fe40
Show file tree

Hide file tree

Showing 23 changed files with 24 additions and 414 deletions.
diff --git a/CHANGES.md → CHANGELOG.md b/CHANGES.md → CHANGELOG.md
diff --git a/build.gradle b/build.gradle
@@ -1,25 +1,17 @@
-ext.githubProjectName = rootProject.name
-
-buildscript {
-    repositories { mavenLocal()
-                   mavenCentral() }
-    apply from: file('gradle/buildscript.gradle'), to: buildscript 
+plugins {
+    id 'nebula.netflixoss' version '2.2.5'
 }
 
-allprojects {
-    repositories { mavenLocal()
-                   mavenCentral()
-                   maven { url 'https://oss.sonatype.org/content/repositories/releases/' }}
+ext {
+    githubProjectName = rootProject.name // Change if github project name is not the same as the root project's name
 }
 
-apply from: file('gradle/convention.gradle')
-apply from: file('gradle/maven.gradle')
-apply from: file('gradle/check.gradle')
-apply from: file('gradle/license.gradle')
-apply from: file('gradle/release.gradle')
-apply plugin: 'idea'
-
 subprojects {
+    apply plugin: 'nebula.netflixoss'
+
+    repositories { 
+        jcenter()
+    }
     apply from: rootProject.file('dagger.gradle')
     group = "com.netflix.${githubProjectName}" // TEMPLATE: Set to organization of project
 }
diff --git a/cli/build.gradle b/cli/build.gradle
@@ -1,15 +1,9 @@
 apply plugin: 'java'
-apply plugin: 'eclipse'
-apply from: rootProject.file('dagger.gradle')
 
-sourceCompatibility = JavaVersion.VERSION_1_6
-targetCompatibility = JavaVersion.VERSION_1_6
+sourceCompatibility = 1.6
 
-eclipse {
-  classpath {
-    downloadSources = true
-    downloadJavadoc = true
-  }
+test {
+    useTestNG()
 }
 
 dependencies {

diff --git a/clouddns/build.gradle b/clouddns/build.gradle
@@ -1,16 +1,6 @@
 apply plugin: 'java'
-apply plugin: 'eclipse'
-apply from: rootProject.file('dagger.gradle')
 
-sourceCompatibility = JavaVersion.VERSION_1_6
-targetCompatibility = JavaVersion.VERSION_1_6
-
-eclipse {
-  classpath {
-    downloadSources = true
-    downloadJavadoc = true
-  }
-}
+sourceCompatibility = 1.6
 
 test {
   useTestNG()

diff --git a/codequality/HEADER b/codequality/HEADER
diff --git a/core/build.gradle b/core/build.gradle
@@ -1,16 +1,6 @@
 apply plugin: 'java'
-apply plugin: 'eclipse'
-apply from: rootProject.file('dagger.gradle')
 
-sourceCompatibility = JavaVersion.VERSION_1_6
-targetCompatibility = JavaVersion.VERSION_1_6
-
-eclipse {
-  classpath {
-    downloadSources = true
-    downloadJavadoc = true
-  }
-}
+sourceCompatibility = 1.6
 
 jar {
   manifest {

diff --git a/dagger.gradle b/dagger.gradle
@@ -92,7 +92,7 @@ rootProject.idea.project.ipr.withXml { projectXml ->
 tasks.ideaModule.dependsOn(prepareAnnotationGeneratedSourceDirs)
 
 idea.module {
-    scopes.PROVIDED.plus += project.configurations.daggerCompiler
+    scopes.PROVIDED.plus += [project.configurations.daggerCompiler]
     iml.withXml { xml->
         def moduleSource = xml.asNode().component.find { it.@name = 'NewModuleRootManager' }.content[0]
         moduleSource.appendNode('sourceFolder', [url: "file://\$MODULE_DIR\$/${relativePath(annotationGeneratedSources)}", isTestSource: false])
@@ -103,7 +103,7 @@ idea.module {
 tasks.eclipseClasspath.dependsOn(prepareAnnotationGeneratedSourceDirs)
 
 eclipse.classpath {
-    plusConfigurations += project.configurations.daggerCompiler
+    plusConfigurations += [project.configurations.daggerCompiler]
 }
 
 tasks.eclipseClasspath {

diff --git a/designate/build.gradle b/designate/build.gradle
@@ -1,16 +1,6 @@
 apply plugin: 'java'
-apply plugin: 'eclipse'
-apply from: rootProject.file('dagger.gradle')
 
-sourceCompatibility = JavaVersion.VERSION_1_6
-targetCompatibility = JavaVersion.VERSION_1_6
-
-eclipse {
-  classpath {
-    downloadSources = true
-    downloadJavadoc = true
-  }
-}
+sourceCompatibility = 1.6
 
 test {
   useTestNG()

diff --git a/discoverydns/build.gradle b/discoverydns/build.gradle
@@ -1,16 +1,7 @@
 apply plugin: 'java'
-apply plugin: 'eclipse'
-apply from: rootProject.file('dagger.gradle')
 
-sourceCompatibility = JavaVersion.VERSION_1_6
-targetCompatibility = JavaVersion.VERSION_1_6
+sourceCompatibility = 1.6
 
-eclipse {
-  classpath {
-    downloadSources = true
-    downloadJavadoc = true
-  }
-}
 test {
   useTestNG()
 }

diff --git a/dynect/build.gradle b/dynect/build.gradle
@@ -1,16 +1,6 @@
 apply plugin: 'java'
-apply plugin: 'eclipse'
-apply from: rootProject.file('dagger.gradle')
 
-sourceCompatibility = JavaVersion.VERSION_1_6
-targetCompatibility = JavaVersion.VERSION_1_6
-
-eclipse {
-  classpath {
-    downloadSources = true
-    downloadJavadoc = true
-  }
-}
+sourceCompatibility = 1.6
 
 test {
   useTestNG()

diff --git a/gradle.properties b/gradle.properties
@@ -1 +0,0 @@
-version=5.0.0-SNAPSHOT

diff --git a/gradle/buildscript.gradle b/gradle/buildscript.gradle
diff --git a/gradle/check.gradle b/gradle/check.gradle
diff --git a/gradle/convention.gradle b/gradle/convention.gradle
diff --git a/gradle/license.gradle b/gradle/license.gradle