Renaming group to com.netflix.devinsight.rewrite, because Bintray :( ...

build.gradle

@@ -5,16 +5,58 @@ buildscript {
         maven { url 'https://dl.bintray.com/kotlin/kotlin-eap-1.1' }
     }
     dependencies {
-        classpath 'com.netflix.nebula:nebula-kotlin-plugin:1.1.0-M04'
+        classpath 'com.netflix.nebula:nebula-publishing-plugin:4.9.1'
+        classpath 'com.netflix.nebula:nebula-kotlin-plugin:1.1.0-beta-38'
         classpath 'com.netflix.nebula:gradle-extra-configurations-plugin:3.0.3'
         classpath 'com.netflix.nebula:gradle-netflixoss-project-plugin:3.5.2'
         classpath 'org.apache.ant:ant:1.9.4' // otherwise shadowJar blows up in subproject
+        classpath 'gradle.plugin.nl.javadude.gradle.plugins:license-gradle-plugin:0.13.1'
     }
 }
 
 allprojects {
     apply plugin: 'nebula.netflixoss'
 
-    group = 'com.netflix.devinsight'
+    group = 'com.netflix.devinsight.rewrite'
     description 'Pluggable and distributed refactoring tool for Java source code'
 }
+
+subprojects {
+    apply plugin: 'nebula.kotlin'
+    apply plugin: 'nebula.maven-resolved-dependencies'
+    apply plugin: 'com.github.hierynomus.license'
+    apply plugin: 'nebula.optional-base'
+
+    repositories {
+        mavenCentral()
+    }
+
+    sourceCompatibility = 1.8
+    targetCompatibility = 1.8
+
+    configurations.all {
+        resolutionStrategy.cacheDynamicVersionsFor 0, 'seconds'
+    }
+
+    publishing {
+        publications {
+            withType(MavenPublication) {
+                pom.withXml {
+                    asNode().dependencies.dependency.scope.each {
+                        it.value = 'compile'
+                    }
+                }
+            }
+        }
+    }
+
+    license {
+        header = file('../gradle/licenseHeader.txt')
+        exclude '**/*.tokens'
+        mapping {
+            kt = 'JAVADOC_STYLE'
+        }
+        sourceSets = project.sourceSets
+        strictCheck = true
+    }
+}

rewrite/build.gradle → rewrite-core/build.gradle

@@ -1,34 +1,16 @@
 buildscript {
     repositories {
         maven { url "https://plugins.gradle.org/m2/" }
-        maven { url 'https://dl.bintray.com/kotlin/kotlin-eap-1.1' }
     }
 
     dependencies {
         classpath 'me.champeau.gradle:antlr4-gradle-plugin:0.1'
         classpath 'com.github.jengelman.gradle.plugins:shadow:1.2.4'
-        classpath 'com.netflix.nebula:nebula-kotlin-plugin:1.1.0-beta-22'
-        classpath 'com.netflix.nebula:gradle-extra-configurations-plugin:3.0.3'
-        classpath 'com.netflix.nebula:nebula-publishing-plugin:4.9.1'
-        classpath 'gradle.plugin.nl.javadude.gradle.plugins:license-gradle-plugin:0.13.1'
     }
 }
 
 apply plugin: 'me.champeau.gradle.antlr4'
 apply plugin: 'com.github.johnrengelman.shadow'
-apply plugin: 'nebula.optional-base'
-apply plugin: 'nebula.kotlin'
-apply plugin: 'nebula.maven-resolved-dependencies'
-apply plugin: 'com.github.hierynomus.license'
-
-repositories {
-    mavenCentral()
-}
-
-group = 'com.netflix.devinsight'
-
-sourceCompatibility = 1.8
-targetCompatibility = 1.8
 
 antlr4.output = new File('src/main/java/com/netflix/rewrite')
 antlr4.extraArgs = ['-package', 'com.netflix.rewrite']
@@ -42,7 +24,6 @@ dependencies {
     compileShaded files("${System.getProperty('java.home')}/../lib/tools.jar")
     compileShaded 'org.eclipse.jgit:org.eclipse.jgit:4.4.1.201607150455-r'
 
-    compile 'com.google.guava:guava:19.0'
     compile 'eu.infomas:annotation-detector:latest.release'
     compile 'org.slf4j:slf4j-api:1.7.+'
     compile 'commons-lang:commons-lang:2.6'
@@ -51,7 +32,7 @@ dependencies {
     compile 'com.koloboke:koloboke-api-jdk8:latest.release'
     compile 'com.koloboke:koloboke-impl-jdk8:latest.release'
 
-    compile 'com.fasterxml.jackson.core:jackson-databind:2.8.5', optional
+    compile 'com.fasterxml.jackson.core:jackson-databind:2.8.6', optional
 
     testCompile 'junit:junit:4.+'
     testCompile 'org.ow2.asm:asm:latest.release'
@@ -96,23 +77,6 @@ publishing {
                 classifier = 'jdkbundle'
             }
         }
-
-        withType(MavenPublication) {
-            pom.withXml {
-                asNode().dependencies.dependency.scope.each {
-                    it.value = 'compile'
-                }
-            }
-        }
     }
 }
 
-license {
-    header = file('../gradle/licenseHeader.txt')
-    exclude '**/*.tokens'
-    mapping {
-        kt = 'JAVADOC_STYLE'
-    }
-    sourceSets = project.sourceSets
-    strictCheck = true
-}

rewrite-core/settings.gradle

@@ -0,0 +1 @@
+rootProject.name = 'rewrite-core'

rewrite/src/test/kotlin/com/netflix/rewrite/ast/LambdaTest.kt → rewrite-core/src/test/kotlin/com/netflix/rewrite/ast/LambdaTest.kt

@@ -92,4 +92,5 @@ abstract class LambdaTest(p: Parser): Parser by p {
         val lambda = a.classes[0].fields()[0].vars[0].initializer!!
         assertEquals("( ) -> { }", lambda.printTrimmed())
     }
+
 }

rewrite-jackson/build.gradle

@@ -1,72 +1,18 @@
-buildscript {
-    repositories {
-        maven { url "https://plugins.gradle.org/m2/" }
-        maven { url 'https://dl.bintray.com/kotlin/kotlin-eap-1.1' }
-    }
-
-    dependencies {
-        classpath 'com.netflix.nebula:nebula-kotlin-plugin:1.1.0-beta-22'
-        classpath 'com.netflix.nebula:nebula-publishing-plugin:4.9.1'
-        classpath 'com.netflix.nebula:gradle-extra-configurations-plugin:3.0.3'
-        classpath 'gradle.plugin.nl.javadude.gradle.plugins:license-gradle-plugin:0.13.1'
-    }
-}
-
-apply plugin: 'nebula.kotlin'
-apply plugin: 'nebula.maven-resolved-dependencies'
-apply plugin: 'com.github.hierynomus.license'
-apply plugin: 'nebula.optional-base'
-
-repositories {
-    mavenCentral()
-}
-
-group = 'com.netflix.devinsight'
-
-sourceCompatibility = 1.8
-targetCompatibility = 1.8
-
-configurations.all {
-    resolutionStrategy.cacheDynamicVersionsFor 0, 'seconds'
-}
-
 dependencies {
     // only needed because IntelliJ Gradle composites do not support file dependencies
     runtime files("${System.getProperty('java.home')}/../lib/tools.jar")
 
     if(project == project.rootProject) {
-        compile 'com.netflix.devinsight:rewrite:latest.release', optional
+        compile 'com.netflix.devinsight.rewrite:rewrite-core:latest.release', optional
     } else {
-        compile project(':rewrite'), optional
+        compile project(':rewrite-core'), optional
     }
 
-    compile 'com.fasterxml.jackson.core:jackson-databind:2.8.5'
-    compile 'com.fasterxml.jackson.core:jackson-annotations:2.8.5'
-    compile 'com.fasterxml.jackson.module:jackson-module-kotlin:2.8.5'
-    compile 'com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.8.5'
+    compile 'com.fasterxml.jackson.core:jackson-databind:2.8.6'
+    compile 'com.fasterxml.jackson.core:jackson-annotations:2.8.6'
+    compile 'com.fasterxml.jackson.module:jackson-module-kotlin:2.8.6'
+    compile 'com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.8.6'
 
     testCompile 'junit:junit:4.+'
     testCompile 'ch.qos.logback:logback-classic:1.0.13'
-}
-
-publishing {
-    publications {
-        withType(MavenPublication) {
-            pom.withXml {
-                asNode().dependencies.dependency.scope.each {
-                    it.value = 'compile'
-                }
-            }
-        }
-    }
-}
-
-license {
-    header = file('../gradle/licenseHeader.txt')
-    exclude '**/*.tokens'
-    mapping {
-        kt = 'JAVADOC_STYLE'
-    }
-    sourceSets = project.sourceSets
-    strictCheck = true
-}
+}

settings.gradle

@@ -13,6 +13,4 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-rootProject.name = 'rewrite-all'
-include 'rewrite', 'rewrite-jackson'
+include 'rewrite-core', 'rewrite-jackson'