ISSUE-138: remove the requirement on nebula-compileApi config as it's…

… no longer needed with latest and greatest gradle.
Netflix · Nov 22, 2017 · 837135b · 837135b
1 parent 9256fd6
commit 837135b
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 38 deletions.
diff --git a/.gitignore b/.gitignore
@@ -67,4 +67,5 @@ atlassian-ide-plugin.xml
 # NetBeans specific files/directories #
 #######################################
 .nbattrs
+/.nb-gradle/
 
diff --git a/build.gradle b/build.gradle
@@ -14,40 +14,39 @@ subprojects {
     apply plugin: 'java'
     apply plugin: 'idea'
     apply plugin: 'eclipse'
-    apply plugin: 'nebula.compile-api'
 
     repositories {
         jcenter()
     }
     group = "com.netflix.${githubProjectName}"
 
     dependencies {
-        compileApi "joda-time:joda-time:2.3"
-        compileApi "org.slf4j:slf4j-api:1.7.6"
-        compileApi "org.slf4j:slf4j-log4j12:1.7.21"
-        compileApi "com.googlecode.json-simple:json-simple:1.1"
-        compileApi "org.apache.httpcomponents:httpclient:4.2.1"
-        compileApi "com.sun.jersey:jersey-core:1.11"
-        testCompile "junit:junit:4.11"
-        testCompile "org.mockito:mockito-all:1.9.5"
-        testCompile "io.netty:netty-all:4.1.14.Final"
+        compile 'joda-time:joda-time:2.3'
+        compile 'org.slf4j:slf4j-api:1.7.6'
+        compile 'org.slf4j:slf4j-log4j12:1.7.21'
+        compile 'com.googlecode.json-simple:json-simple:1.1'
+        compile 'org.apache.httpcomponents:httpclient:4.2.1'
+        compile 'com.sun.jersey:jersey-core:1.11'
+        testCompile 'junit:junit:4.11'
+        testCompile 'org.mockito:mockito-all:1.9.5'
+        testCompile 'io.netty:netty-all:4.1.14.Final'
     }
 
     project.tasks.withType(Javadoc) {
         if (JavaVersion.current().isJava8Compatible()) {
             options.addStringOption('Xdoclint:none', '-quiet')
         }
     }
-
 }
+
 project(':dyno-core') {
     apply plugin: 'osgi'
     apply plugin: 'project-report'
 
     dependencies {
-        compileApi "org.apache.commons:commons-math:2.2"
-        compileApi "org.apache.commons:commons-lang3:3.6"
-        compileApi "commons-io:commons-io:2.4"
+        compile 'org.apache.commons:commons-math:2.2'
+        compile 'org.apache.commons:commons-lang3:3.6'
+        compile 'commons-io:commons-io:2.4'
     }
 }
 
@@ -56,13 +55,13 @@ project(':dyno-contrib') {
     apply plugin: 'project-report'
 
     dependencies {
-        compileApi  project(':dyno-core')
-        compileApi "com.google.inject:guice:4.1.0"
-        compileApi "com.netflix.archaius:archaius-core:0.7.5"
-        compileApi "com.netflix.servo:servo-core:0.12.17"
-        compileApi 'com.netflix.eureka:eureka-client:1.8.1'
-        compileApi 'org.apache.commons:commons-lang3:3.5'
-        compileApi ('com.ecwid.consul:consul-api:1.2.1') {
+        compile project(':dyno-core')
+        compile 'com.google.inject:guice:4.1.0'
+        compile 'com.netflix.archaius:archaius-core:0.7.5'
+        compile 'com.netflix.servo:servo-core:0.12.17'
+        compile 'com.netflix.eureka:eureka-client:1.8.1'
+        compile 'org.apache.commons:commons-lang3:3.5'
+        compile ('com.ecwid.consul:consul-api:1.2.1') {
             exclude group: 'org.apache.httpcomponents'
         }       
         testCompile 'com.pszymczyk.consul:embedded-consul:0.3.3'
@@ -74,9 +73,8 @@ project(':dyno-memcache') {
     apply plugin: 'project-report'
 
     dependencies {
-        compileApi  project(':dyno-core')
-        compileApi  project(':dyno-contrib')
-//        compileApi "net.spy:spymemcached:2.10.2+"
+        compile project(':dyno-core')
+        compile project(':dyno-contrib')
     }
 }
 
@@ -85,9 +83,9 @@ project(':dyno-jedis') {
     apply plugin: 'project-report'
 
     dependencies {
-        compileApi  project(':dyno-core')
-        compileApi  project(':dyno-contrib')
-        compileApi "redis.clients:jedis:2.9.0"
+        compile project(':dyno-core')
+        compile project(':dyno-contrib')
+        compile 'redis.clients:jedis:2.9.0'
     }
 }
 
@@ -96,9 +94,9 @@ project(':dyno-redisson') {
     apply plugin: 'project-report'
 
     dependencies {
-        compileApi  project(':dyno-core')
-        compileApi  project(':dyno-contrib')
-        compileApi "org.redisson:redisson:1.1.0"
+        compile project(':dyno-core')
+        compile project(':dyno-contrib')
+        compile 'org.redisson:redisson:1.1.0'
     }
 }
 
@@ -107,11 +105,11 @@ project(':dyno-demo') {
     apply plugin: 'project-report'
 
     dependencies {
-        compileApi  project(':dyno-core')
-        compileApi  project(':dyno-contrib')
-        compileApi  project(':dyno-memcache')
-        compileApi  project(':dyno-jedis')
-        compileApi  project(':dyno-recipes')
+        compile project(':dyno-core')
+        compile project(':dyno-contrib')
+        compile project(':dyno-memcache')
+        compile project(':dyno-jedis')
+        compile project(':dyno-recipes')
     }
 }
 
@@ -120,7 +118,7 @@ project(':dyno-recipes') {
     apply plugin: 'project-report'
 
     dependencies {
-        compileApi project(':dyno-core')
-        compileApi project(':dyno-jedis')
+        compile project(':dyno-core')
+        compile project(':dyno-jedis')
     }
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.3.1-bin.zip