cleanup build gradle and version props

palantir · Jul 19, 2018 · 3d54103 · 3d54103
1 parent 82f7e48
commit 3d54103
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 25 deletions.
diff --git a/build.gradle b/build.gradle
@@ -14,10 +14,10 @@ buildscript {
     dependencies {
         classpath 'com.netflix.nebula:nebula-dependency-recommender:5.2.0'
         classpath 'com.palantir.baseline:gradle-baseline-java:0.20.1'
-        classpath 'com.palantir.launchconfig:gradle-launch-config-plugin:1.2.0'
         classpath 'com.palantir.configurationresolver:gradle-configuration-resolver-plugin:0.3.0'
         classpath 'com.palantir.gradle.conjure:gradle-conjure:4.2.0'
         classpath 'com.palantir.gradle.gitversion:gradle-git-version:0.7.1'
+        classpath 'com.palantir.launchconfig:gradle-launch-config-plugin:1.2.0'
         classpath 'gradle.plugin.com.palantir:gradle-circle-style:1.1.2'
         classpath 'gradle.plugin.org.inferred:gradle-processors:1.2.15'
     }
@@ -53,18 +53,3 @@ allprojects {
         propertiesFile file: project.rootProject.file('versions.props')
     }
 }
-
-configure(subprojects - project(':example-api')) {
-    apply plugin: 'com.palantir.baseline-checkstyle'
-    apply plugin: 'com.palantir.baseline-eclipse'
-    apply plugin: 'com.palantir.baseline-error-prone'
-    apply plugin: 'com.palantir.baseline-idea'
-    apply plugin: 'java-library'
-    apply plugin: 'org.inferred.processors'
-
-    sourceCompatibility = 1.8
-
-    tasks.withType(JavaCompile) {
-        options.compilerArgs += ['-XepDisableWarningsInGeneratedCode', '-Werror']
-    }
-}
diff --git a/example-server/build.gradle b/example-server/build.gradle
@@ -1,8 +1,18 @@
-apply from: "${rootDir}/gradle/java.gradle"
+apply plugin: 'java'
 apply plugin: 'application'
+apply plugin: 'com.palantir.baseline-checkstyle'
+apply plugin: 'com.palantir.baseline-eclipse'
+apply plugin: 'com.palantir.baseline-error-prone'
+apply plugin: 'com.palantir.baseline-idea'
 apply plugin: 'com.palantir.launch-config'
 apply plugin: 'org.inferred.processors'
 
+tasks.withType(JavaCompile) {
+    options.compilerArgs += ['-XepDisableWarningsInGeneratedCode', '-Werror']
+}
+
+sourceCompatibility = '1.8'
+
 dependencies {
     processor 'org.immutables:value'
 
@@ -26,3 +36,4 @@ mainClassName = 'com.palantir.conjure.examples.RecipeBookApplication'
 run {
     args 'server', 'var/conf/recipes.yml'
 }
+
diff --git a/gradle/java.gradle b/gradle/java.gradle
diff --git a/versions.props b/versions.props
@@ -1,10 +1,10 @@
 com.google.guava:guava = 21.0
+com.netflix.feign:feign-*= 8.18.0
 com.palantir.conjure.java:* = 1.0.0
 com.palantir.conjure.typescript:* = 3.0.0
 com.palantir.conjure:conjure = 4.0.0
 com.palantir.remoting3:jackson-support = 3.38.0
 com.palantir.remoting3:jersey-servers = 3.38.0
-com.netflix.feign:feign-*= 8.18.0
 io.dropwizard:dropwizard-core = 1.3.5
 io.dropwizard:dropwizard-testing = 1.3.5
 junit:junit = 4.12