Move into 'java' and 'android' modules.

Trolldemorted · Feb 28, 2015 · 7431302 · 7431302
1 parent 30623fb
commit 7431302
Show file tree

Hide file tree

Showing 70 changed files with 108 additions and 50 deletions.
diff --git a/android/build.gradle b/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())
+        }
+    }
+}
+
diff --git a/src/main/AndroidManifest.xml → android/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml → android/src/main/AndroidManifest.xml
diff --git a/build.gradle b/build.gradle
@@ -1,53 +1,13 @@
-buildscript {
-    repositories {
-        mavenCentral()
-    }
-
-    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())
+subprojects {
+    ext.version_number     = "1.0.0"
+    ext.group_info         = "org.whispersystems"
+    ext.axolotl_version    = "1.1.1"
+
+    if (JavaVersion.current().isJava8Compatible()) {
+        allprojects {
+            tasks.withType(Javadoc) {
+                options.addStringOption('Xdoclint:none', '-quiet')
+            }
         }
     }
 }
diff --git a/java/build.gradle b/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())
+        }
+    }
+}
diff --git a/...secure/push/PushTransportDetailsTest.java → ...secure/push/PushTransportDetailsTest.java b/...secure/push/PushTransportDetailsTest.java → ...secure/push/PushTransportDetailsTest.java
diff --git a/...tsecure/api/TextSecureAccountManager.java → ...tsecure/api/TextSecureAccountManager.java b/...tsecure/api/TextSecureAccountManager.java → ...tsecure/api/TextSecureAccountManager.java
diff --git a/...textsecure/api/TextSecureMessagePipe.java → ...textsecure/api/TextSecureMessagePipe.java b/...textsecure/api/TextSecureMessagePipe.java → ...textsecure/api/TextSecureMessagePipe.java
diff --git a/...secure/api/TextSecureMessageReceiver.java → ...secure/api/TextSecureMessageReceiver.java b/...secure/api/TextSecureMessageReceiver.java → ...secure/api/TextSecureMessageReceiver.java
diff --git a/...xtsecure/api/TextSecureMessageSender.java → ...xtsecure/api/TextSecureMessageSender.java b/...xtsecure/api/TextSecureMessageSender.java → ...xtsecure/api/TextSecureMessageSender.java
diff --git a/...i/crypto/AttachmentCipherInputStream.java → ...i/crypto/AttachmentCipherInputStream.java b/...i/crypto/AttachmentCipherInputStream.java → ...i/crypto/AttachmentCipherInputStream.java
diff --git a/.../crypto/AttachmentCipherOutputStream.java → .../crypto/AttachmentCipherOutputStream.java b/.../crypto/AttachmentCipherOutputStream.java → .../crypto/AttachmentCipherOutputStream.java
diff --git a/...xtsecure/api/crypto/TextSecureCipher.java → ...xtsecure/api/crypto/TextSecureCipher.java b/...xtsecure/api/crypto/TextSecureCipher.java → ...xtsecure/api/crypto/TextSecureCipher.java
diff --git a/...pi/crypto/UntrustedIdentityException.java → ...pi/crypto/UntrustedIdentityException.java b/...pi/crypto/UntrustedIdentityException.java → ...pi/crypto/UntrustedIdentityException.java
diff --git a/...re/api/messages/TextSecureAttachment.java → ...re/api/messages/TextSecureAttachment.java b/...re/api/messages/TextSecureAttachment.java → ...re/api/messages/TextSecureAttachment.java
diff --git a/...messages/TextSecureAttachmentPointer.java → ...messages/TextSecureAttachmentPointer.java b/...messages/TextSecureAttachmentPointer.java → ...messages/TextSecureAttachmentPointer.java
diff --git a/.../messages/TextSecureAttachmentStream.java → .../messages/TextSecureAttachmentStream.java b/.../messages/TextSecureAttachmentStream.java → .../messages/TextSecureAttachmentStream.java
diff --git a/...cure/api/messages/TextSecureEnvelope.java → ...cure/api/messages/TextSecureEnvelope.java b/...cure/api/messages/TextSecureEnvelope.java → ...cure/api/messages/TextSecureEnvelope.java
diff --git a/...tsecure/api/messages/TextSecureGroup.java → ...tsecure/api/messages/TextSecureGroup.java b/...tsecure/api/messages/TextSecureGroup.java → ...tsecure/api/messages/TextSecureGroup.java
diff --git a/...ecure/api/messages/TextSecureMessage.java → ...ecure/api/messages/TextSecureMessage.java b/...ecure/api/messages/TextSecureMessage.java → ...ecure/api/messages/TextSecureMessage.java
diff --git a/...tsecure/api/push/ContactTokenDetails.java → ...tsecure/api/push/ContactTokenDetails.java b/...tsecure/api/push/ContactTokenDetails.java → ...tsecure/api/push/ContactTokenDetails.java
diff --git a/...xtsecure/api/push/SignedPreKeyEntity.java → ...xtsecure/api/push/SignedPreKeyEntity.java b/...xtsecure/api/push/SignedPreKeyEntity.java → ...xtsecure/api/push/SignedPreKeyEntity.java
diff --git a/...extsecure/api/push/TextSecureAddress.java → ...extsecure/api/push/TextSecureAddress.java b/...extsecure/api/push/TextSecureAddress.java → ...extsecure/api/push/TextSecureAddress.java
diff --git a/...stems/textsecure/api/push/TrustStore.java → ...stems/textsecure/api/push/TrustStore.java b/...stems/textsecure/api/push/TrustStore.java → ...stems/textsecure/api/push/TrustStore.java
diff --git a/...eptions/AuthorizationFailedException.java → ...eptions/AuthorizationFailedException.java b/...eptions/AuthorizationFailedException.java → ...eptions/AuthorizationFailedException.java
diff --git a/...sh/exceptions/EncapsulatedExceptions.java → ...sh/exceptions/EncapsulatedExceptions.java b/...sh/exceptions/EncapsulatedExceptions.java → ...sh/exceptions/EncapsulatedExceptions.java
diff --git a/...xceptions/ExpectationFailedException.java → ...xceptions/ExpectationFailedException.java b/...xceptions/ExpectationFailedException.java → ...xceptions/ExpectationFailedException.java
diff --git a/...h/exceptions/NetworkFailureException.java → ...h/exceptions/NetworkFailureException.java b/...h/exceptions/NetworkFailureException.java → ...h/exceptions/NetworkFailureException.java
diff --git a/...s/NonSuccessfulResponseCodeException.java → ...s/NonSuccessfulResponseCodeException.java b/...s/NonSuccessfulResponseCodeException.java → ...s/NonSuccessfulResponseCodeException.java
diff --git a/...pi/push/exceptions/NotFoundException.java → ...pi/push/exceptions/NotFoundException.java b/...pi/push/exceptions/NotFoundException.java → ...pi/push/exceptions/NotFoundException.java
diff --git a/...push/exceptions/PushNetworkException.java → ...push/exceptions/PushNetworkException.java b/...push/exceptions/PushNetworkException.java → ...push/exceptions/PushNetworkException.java
diff --git a/...i/push/exceptions/RateLimitException.java → ...i/push/exceptions/RateLimitException.java b/...i/push/exceptions/RateLimitException.java → ...i/push/exceptions/RateLimitException.java
diff --git a/...exceptions/UnregisteredUserException.java → ...exceptions/UnregisteredUserException.java b/...exceptions/UnregisteredUserException.java → ...exceptions/UnregisteredUserException.java
diff --git a/...tsecure/api/util/CredentialsProvider.java → ...tsecure/api/util/CredentialsProvider.java b/...tsecure/api/util/CredentialsProvider.java → ...tsecure/api/util/CredentialsProvider.java
diff --git a/...cure/api/util/InvalidNumberException.java → ...cure/api/util/InvalidNumberException.java b/...cure/api/util/InvalidNumberException.java → ...cure/api/util/InvalidNumberException.java
diff --git a/...secure/api/util/PhoneNumberFormatter.java → ...secure/api/util/PhoneNumberFormatter.java b/...secure/api/util/PhoneNumberFormatter.java → ...secure/api/util/PhoneNumberFormatter.java
diff --git a/...e/internal/crypto/ProvisioningCipher.java → ...e/internal/crypto/ProvisioningCipher.java b/...e/internal/crypto/ProvisioningCipher.java → ...e/internal/crypto/ProvisioningCipher.java
diff --git a/...cure/internal/push/AccountAttributes.java → ...cure/internal/push/AccountAttributes.java b/...cure/internal/push/AccountAttributes.java → ...cure/internal/push/AccountAttributes.java
diff --git a/...nternal/push/ContactTokenDetailsList.java → ...nternal/push/ContactTokenDetailsList.java b/...nternal/push/ContactTokenDetailsList.java → ...nternal/push/ContactTokenDetailsList.java
diff --git a/...ecure/internal/push/ContactTokenList.java → ...ecure/internal/push/ContactTokenList.java b/...ecure/internal/push/ContactTokenList.java → ...ecure/internal/push/ContactTokenList.java
diff --git a/.../textsecure/internal/push/DeviceCode.java → .../textsecure/internal/push/DeviceCode.java b/.../textsecure/internal/push/DeviceCode.java → .../textsecure/internal/push/DeviceCode.java
diff --git a/...cure/internal/push/MismatchedDevices.java → ...cure/internal/push/MismatchedDevices.java b/...cure/internal/push/MismatchedDevices.java → ...cure/internal/push/MismatchedDevices.java
diff --git a/...re/internal/push/OutgoingPushMessage.java → ...re/internal/push/OutgoingPushMessage.java b/...re/internal/push/OutgoingPushMessage.java → ...re/internal/push/OutgoingPushMessage.java
diff --git a/...nternal/push/OutgoingPushMessageList.java → ...nternal/push/OutgoingPushMessageList.java b/...nternal/push/OutgoingPushMessageList.java → ...nternal/push/OutgoingPushMessageList.java
diff --git a/...extsecure/internal/push/PreKeyEntity.java → ...extsecure/internal/push/PreKeyEntity.java b/...extsecure/internal/push/PreKeyEntity.java → ...extsecure/internal/push/PreKeyEntity.java
diff --git a/...tsecure/internal/push/PreKeyResponse.java → ...tsecure/internal/push/PreKeyResponse.java b/...tsecure/internal/push/PreKeyResponse.java → ...tsecure/internal/push/PreKeyResponse.java
diff --git a/...ure/internal/push/PreKeyResponseItem.java → ...ure/internal/push/PreKeyResponseItem.java b/...ure/internal/push/PreKeyResponseItem.java → ...ure/internal/push/PreKeyResponseItem.java
diff --git a/...textsecure/internal/push/PreKeyState.java → ...textsecure/internal/push/PreKeyState.java b/...textsecure/internal/push/PreKeyState.java → ...textsecure/internal/push/PreKeyState.java
diff --git a/...extsecure/internal/push/PreKeyStatus.java → ...extsecure/internal/push/PreKeyStatus.java b/...extsecure/internal/push/PreKeyStatus.java → ...extsecure/internal/push/PreKeyStatus.java
diff --git a/...re/internal/push/ProvisioningMessage.java → ...re/internal/push/ProvisioningMessage.java b/...re/internal/push/ProvisioningMessage.java → ...re/internal/push/ProvisioningMessage.java
diff --git a/...ure/internal/push/ProvisioningProtos.java → ...ure/internal/push/ProvisioningProtos.java b/...ure/internal/push/ProvisioningProtos.java → ...ure/internal/push/ProvisioningProtos.java
diff --git a/...ure/internal/push/PushAttachmentData.java → ...ure/internal/push/PushAttachmentData.java b/...ure/internal/push/PushAttachmentData.java → ...ure/internal/push/PushAttachmentData.java
diff --git a/...ms/textsecure/internal/push/PushBody.java → ...ms/textsecure/internal/push/PushBody.java b/...ms/textsecure/internal/push/PushBody.java → ...ms/textsecure/internal/push/PushBody.java
diff --git a/...cure/internal/push/PushMessageProtos.java → ...cure/internal/push/PushMessageProtos.java b/...cure/internal/push/PushMessageProtos.java → ...cure/internal/push/PushMessageProtos.java
diff --git a/...cure/internal/push/PushServiceSocket.java → ...cure/internal/push/PushServiceSocket.java b/...cure/internal/push/PushServiceSocket.java → ...cure/internal/push/PushServiceSocket.java
diff --git a/...e/internal/push/PushTransportDetails.java → ...e/internal/push/PushTransportDetails.java b/...e/internal/push/PushTransportDetails.java → ...e/internal/push/PushTransportDetails.java
diff --git a/...re/internal/push/SendMessageResponse.java → ...re/internal/push/SendMessageResponse.java b/...re/internal/push/SendMessageResponse.java → ...re/internal/push/SendMessageResponse.java
diff --git a/...extsecure/internal/push/StaleDevices.java → ...extsecure/internal/push/StaleDevices.java b/...extsecure/internal/push/StaleDevices.java → ...extsecure/internal/push/StaleDevices.java
diff --git a/...xceptions/MismatchedDevicesException.java → ...xceptions/MismatchedDevicesException.java b/...xceptions/MismatchedDevicesException.java → ...xceptions/MismatchedDevicesException.java
diff --git a/...ush/exceptions/StaleDevicesException.java → ...ush/exceptions/StaleDevicesException.java b/...ush/exceptions/StaleDevicesException.java → ...ush/exceptions/StaleDevicesException.java
diff --git a/...tems/textsecure/internal/util/Base64.java → ...tems/textsecure/internal/util/Base64.java b/...tems/textsecure/internal/util/Base64.java → ...tems/textsecure/internal/util/Base64.java
diff --git a/...ternal/util/BlacklistingTrustManager.java → ...ternal/util/BlacklistingTrustManager.java b/...ternal/util/BlacklistingTrustManager.java → ...ternal/util/BlacklistingTrustManager.java
diff --git a/...systems/textsecure/internal/util/Hex.java → ...systems/textsecure/internal/util/Hex.java b/...systems/textsecure/internal/util/Hex.java → ...systems/textsecure/internal/util/Hex.java
diff --git a/...ms/textsecure/internal/util/JsonUtil.java → ...ms/textsecure/internal/util/JsonUtil.java b/...ms/textsecure/internal/util/JsonUtil.java → ...ms/textsecure/internal/util/JsonUtil.java
diff --git a/...ernal/util/StaticCredentialsProvider.java → ...ernal/util/StaticCredentialsProvider.java b/...ernal/util/StaticCredentialsProvider.java → ...ernal/util/StaticCredentialsProvider.java
diff --git a/...ystems/textsecure/internal/util/Util.java → ...ystems/textsecure/internal/util/Util.java b/...ystems/textsecure/internal/util/Util.java → ...ystems/textsecure/internal/util/Util.java
diff --git a/...ternal/websocket/OkHttpClientWrapper.java → ...ternal/websocket/OkHttpClientWrapper.java b/...ternal/websocket/OkHttpClientWrapper.java → ...ternal/websocket/OkHttpClientWrapper.java
diff --git a/...ternal/websocket/WebSocketConnection.java → ...ternal/websocket/WebSocketConnection.java b/...ternal/websocket/WebSocketConnection.java → ...ternal/websocket/WebSocketConnection.java
diff --git a/...nal/websocket/WebSocketEventListener.java → ...nal/websocket/WebSocketEventListener.java b/...nal/websocket/WebSocketEventListener.java → ...nal/websocket/WebSocketEventListener.java
diff --git a/...e/internal/websocket/WebSocketProtos.java → ...e/internal/websocket/WebSocketProtos.java b/...e/internal/websocket/WebSocketProtos.java → ...e/internal/websocket/WebSocketProtos.java
diff --git a/settings.gradle b/settings.gradle
@@ -0,0 +1 @@
+include ':java', ':android'