Rework project structure a bit to clean up gradle files

Prep for uploading to jCenter instead of needing Jitpack

Author: bkromhout

.gitignore

@@ -15,6 +15,7 @@ out/
 
 # Local configuration file (sdk path, etc)
 local.properties
+private.properties
 
 # Eclipse project files
 .classpath
@@ -33,6 +34,3 @@ local.properties
 # Keystore and properties
 *.keystore
 keystore.properties
-
-FictionDL.jar
-FictionDL-old.jar

build.gradle

@@ -1,40 +1,29 @@
-apply plugin: 'java'
-apply plugin: 'maven'
-
-group = 'com.github.java-diff-utils'
-version = '2.1.1'
-
-description = """java-diff-utils"""
-
-sourceCompatibility = 1.7
-targetCompatibility = 1.7
-
-task sourcesJar(type: Jar, dependsOn: classes) {
-    classifier = 'sources'
-    from sourceSets.main.allSource
-}
-
-javadoc {
-    failOnError = false
-}
-
-task javadocJar(type: Jar, dependsOn: javadoc) {
-    classifier = 'javadoc'
-    from javadoc.destinationDir
+buildscript {
+    repositories {
+        jcenter()
+    }
+    dependencies {
+        classpath 'com.novoda:bintray-release:0.4.0' // clean build uploadLib -PdryRun=false
+    }
 }
 
-artifacts {
-    archives sourcesJar
-    archives javadocJar
+ext {
+    if (file("private.properties").exists()) {
+        Properties props = new Properties()
+        props.load(new FileInputStream(file("private.properties")))
+        BINTRAY_KEY = props.getProperty('BINTRAY_KEY')
+    } else {
+        BINTRAY_KEY = ""
+    }
 }
 
-repositories {
-     maven { url "https://oss.sonatype.org/content/repositories/snapshots" }
-     maven { url "http://repo.maven.apache.org/maven2" }
+task uploadLib {
+    dependsOn ':java-diff-utils-lib:bintrayUpload'
 }
 
-dependencies {
-    compile group: 'com.google.code.findbugs', name: 'jsr305', version:'3.0.0'
-    testCompile group: 'org.hamcrest', name: 'hamcrest-library', version:'1.3'
-    testCompile group: 'junit', name: 'junit', version:'4.12'
+allprojects {
+    repositories {
+        maven { url "https://oss.sonatype.org/content/repositories/snapshots" }
+        maven { url "http://repo.maven.apache.org/maven2" }
+    }
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Tue Feb 23 21:24:53 EST 2016
+#Wed Nov 23 10:50:46 EST 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.11-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.2-bin.zip

java-diff-utils-lib/build.gradle

@@ -0,0 +1,48 @@
+apply plugin: 'java'
+apply plugin: 'com.novoda.bintray-release'
+
+sourceCompatibility = 1.7
+targetCompatibility = 1.7
+
+dependencies {
+    compile group: 'com.google.code.findbugs', name: 'jsr305', version:'3.0.0'
+    testCompile group: 'org.hamcrest', name: 'hamcrest-library', version:'1.3'
+    testCompile group: 'junit', name: 'junit', version:'4.12'
+}
+
+task sourcesJar(type: Jar, dependsOn: classes) {
+    classifier = 'sources'
+    from sourceSets.main.allSource
+}
+
+javadoc {
+    failOnError = false
+}
+
+if (JavaVersion.current().isJava8Compatible()) {
+    tasks.withType(Javadoc) {
+        options.addStringOption('Xdoclint:none', '-quiet')
+    }
+}
+
+task javadocJar(type: Jar, dependsOn: javadoc) {
+    classifier = 'javadoc'
+    from javadoc.destinationDir
+}
+
+artifacts {
+    archives sourcesJar
+    archives javadocJar
+}
+
+publish {
+    bintrayUser = 'bkromhout'
+    bintrayKey = BINTRAY_KEY
+    userOrg = 'bkromhout'
+    groupId = 'com.github.bkromhout'
+    artifactId = 'java-diff-utils'
+    version = '2.1.1'
+    desc = 'The java-diff-utils library is for computing diffs, applying patches, generation side-by-side view in Java.'
+    website = 'https://github.com/bkromhout/java-diff-utils'
+    licences = ['Apache-2.0']
+}

src/main/java/difflib/ChangeDelta.java renamed to java-diff-utils-lib/src/main/java/difflib/ChangeDelta.java

@@ -95,7 +95,7 @@ public int size() {
     }
 
     /**
-     * Returns the index of the last line of the chunk. (zero-based numbering)
+     * @return the index of the last line of the chunk. (zero-based numbering)
      */
     @Nonnegative
     public int last() {

src/main/java/difflib/Chunk.java renamed to java-diff-utils-lib/src/main/java/difflib/Chunk.java

@@ -1 +1,2 @@
+include ':java-diff-utils-lib'
 rootProject.name = 'java-diff-utils'