Move into 'java' and 'android' modules.

android/build.gradle

@@ -0,0 +1,53 @@
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+
+    dependencies {
+        classpath 'com.android.tools.build:gradle:1.1.0'
+    }
+}
+
+apply plugin: 'com.android.library'
+apply plugin: 'maven'
+
+repositories {
+    mavenCentral()
+    mavenLocal()
+}
+
+dependencies {
+    compile 'org.whispersystems:axolotl-android:1.1.1'
+    compile (project(':java')) {
+        exclude group: 'org.whispersystems', module: 'axolotl-java'
+    }
+}
+
+android {
+    compileSdkVersion 21
+    buildToolsVersion '21.1.2'
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_7
+        targetCompatibility JavaVersion.VERSION_1_7
+    }
+}
+
+tasks.whenTaskAdded { task ->
+    if (task.name.equals("lint")) {
+        task.enabled = false
+    }
+}
+
+version '0.1'
+group 'org.whispersystems.textsecure'
+archivesBaseName = 'libtextsecure'
+
+uploadArchives {
+    repositories {
+        mavenDeployer {
+            repository(url: mavenLocal().getUrl())
+        }
+    }
+}
+

build.gradle

@@ -1,53 +1,13 @@
-buildscript {
-    repositories {
-        mavenCentral()
-    }
+subprojects {
+    ext.version_number     = "1.0.0"
+    ext.group_info         = "org.whispersystems"
+    ext.axolotl_version    = "1.1.1"
 
-    dependencies {
-        classpath 'com.android.tools.build:gradle:1.0.0'
-    }
-}
-
-apply plugin: 'com.android.library'
-apply plugin: 'maven'
-
-repositories {
-    mavenCentral()
-}
-
-dependencies {
-    compile 'com.google.protobuf:protobuf-java:2.5.0'
-    compile 'com.googlecode.libphonenumber:libphonenumber:6.1'
-    compile 'com.fasterxml.jackson.core:jackson-databind:2.5.0'
-
-    compile 'org.whispersystems:axolotl-android:1.0.0'
-    compile 'com.squareup.okhttp:okhttp:2.2.0'
-}
-
-android {
-    compileSdkVersion 21
-    buildToolsVersion '21.1.2'
-
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_7
-        targetCompatibility JavaVersion.VERSION_1_7
-    }
-}
-
-tasks.whenTaskAdded { task ->
-    if (task.name.equals("lint")) {
-        task.enabled = false
-    }
-}
-
-version '0.1'
-group 'org.whispersystems.textsecure'
-archivesBaseName = 'libtextsecure'
-
-uploadArchives {
-    repositories {
-        mavenDeployer {
-            repository(url: mavenLocal().getUrl())
+    if (JavaVersion.current().isJava8Compatible()) {
+        allprojects {
+            tasks.withType(Javadoc) {
+                options.addStringOption('Xdoclint:none', '-quiet')
+            }
         }
     }
 }

java/build.gradle

@@ -0,0 +1,44 @@
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+
+    dependencies {
+        classpath 'com.android.tools.build:gradle:1.1.0'
+    }
+}
+
+apply plugin: 'java'
+apply plugin: 'maven'
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+    compile 'com.google.protobuf:protobuf-java:2.5.0'
+    compile 'com.googlecode.libphonenumber:libphonenumber:6.1'
+    compile 'com.fasterxml.jackson.core:jackson-databind:2.5.0'
+
+    compile 'org.whispersystems:axolotl-java:1.1.1'
+    compile 'com.squareup.okhttp:okhttp:2.2.0'
+}
+
+
+tasks.whenTaskAdded { task ->
+    if (task.name.equals("lint")) {
+        task.enabled = false
+    }
+}
+
+version '0.1'
+group 'org.whispersystems.textsecure'
+archivesBaseName = 'libtextsecure'
+
+uploadArchives {
+    repositories {
+        mavenDeployer {
+            repository(url: mavenLocal().getUrl())
+        }
+    }
+}

settings.gradle

@@ -0,0 +1 @@
+include ':java', ':android'