From afc91fb9181e6999e7229db05da83cd832687918 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Wed, 6 May 2015 00:08:04 +0200 Subject: [PATCH] Switch to new library repos --- OpenKeychain/build.gradle | 4 ++-- .../sufficientlysecure/keychain/ui/DecryptFilesActivity.java | 2 +- .../sufficientlysecure/keychain/ui/DecryptTextActivity.java | 2 +- .../sufficientlysecure/keychain/ui/EncryptFilesActivity.java | 2 +- .../sufficientlysecure/keychain/ui/EncryptTextActivity.java | 2 +- .../sufficientlysecure/keychain/ui/ImportKeysActivity.java | 3 +-- .../keychain/ui/ImportKeysProxyActivity.java | 2 +- build.gradle | 2 ++ extern/openkeychain-api-lib | 2 +- extern/openpgp-api-lib | 2 +- settings.gradle | 4 ++-- 11 files changed, 14 insertions(+), 13 deletions(-) diff --git a/OpenKeychain/build.gradle b/OpenKeychain/build.gradle index 2a0779125..6ae840101 100644 --- a/OpenKeychain/build.gradle +++ b/OpenKeychain/build.gradle @@ -41,8 +41,8 @@ dependencies { compile 'com.mikepenz.iconics:community-material-typeface:1.0.0@aar' // libs as submodules - compile project(':extern:openpgp-api-lib') - compile project(':extern:openkeychain-api-lib') + compile project(':extern:openpgp-api-lib:openpgp-api') + compile project(':extern:openkeychain-api-lib:openkeychain-intents') compile project(':extern:spongycastle:core') compile project(':extern:spongycastle:pg') compile project(':extern:spongycastle:pkix') diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFilesActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFilesActivity.java index dce2386b5..c9a590c5b 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFilesActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFilesActivity.java @@ -25,7 +25,7 @@ import android.view.View; import org.sufficientlysecure.keychain.Constants; import org.sufficientlysecure.keychain.R; -import org.sufficientlysecure.keychain.api.OpenKeychainIntents; +import org.sufficientlysecure.keychain.intents.OpenKeychainIntents; import org.sufficientlysecure.keychain.ui.base.BaseActivity; import org.sufficientlysecure.keychain.util.Log; diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptTextActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptTextActivity.java index 728e3ba41..e2f527cee 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptTextActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptTextActivity.java @@ -26,7 +26,7 @@ import android.view.View; import org.sufficientlysecure.keychain.Constants; import org.sufficientlysecure.keychain.R; -import org.sufficientlysecure.keychain.api.OpenKeychainIntents; +import org.sufficientlysecure.keychain.intents.OpenKeychainIntents; import org.sufficientlysecure.keychain.compatibility.ClipboardReflection; import org.sufficientlysecure.keychain.operations.results.OperationResult; import org.sufficientlysecure.keychain.operations.results.SingletonResult; diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFilesActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFilesActivity.java index 64e908b1a..b3ec60890 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFilesActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFilesActivity.java @@ -28,7 +28,7 @@ import android.view.View; import org.sufficientlysecure.keychain.Constants; import org.sufficientlysecure.keychain.R; -import org.sufficientlysecure.keychain.api.OpenKeychainIntents; +import org.sufficientlysecure.keychain.intents.OpenKeychainIntents; import org.sufficientlysecure.keychain.ui.base.BaseActivity; import org.sufficientlysecure.keychain.util.Passphrase; diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptTextActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptTextActivity.java index dd6dd6594..52d098adc 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptTextActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptTextActivity.java @@ -26,7 +26,7 @@ import android.view.View; import org.sufficientlysecure.keychain.Constants; import org.sufficientlysecure.keychain.R; -import org.sufficientlysecure.keychain.api.OpenKeychainIntents; +import org.sufficientlysecure.keychain.intents.OpenKeychainIntents; import org.sufficientlysecure.keychain.ui.base.BaseActivity; import org.sufficientlysecure.keychain.util.Log; import org.sufficientlysecure.keychain.util.Passphrase; diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java index 5d9950db6..4eb01a76c 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java @@ -30,7 +30,7 @@ import android.view.ViewGroup; import org.sufficientlysecure.keychain.Constants; import org.sufficientlysecure.keychain.R; -import org.sufficientlysecure.keychain.api.OpenKeychainIntents; +import org.sufficientlysecure.keychain.intents.OpenKeychainIntents; import org.sufficientlysecure.keychain.keyimport.ImportKeysListEntry; import org.sufficientlysecure.keychain.keyimport.ParcelableKeyRing; import org.sufficientlysecure.keychain.operations.results.ImportKeyResult; @@ -39,7 +39,6 @@ import org.sufficientlysecure.keychain.ui.base.BaseNfcActivity; import org.sufficientlysecure.keychain.service.CloudImportService; import org.sufficientlysecure.keychain.service.ServiceProgressHandler; import org.sufficientlysecure.keychain.ui.dialog.ProgressDialogFragment; -import org.sufficientlysecure.keychain.ui.util.FormattingUtils; import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils; import org.sufficientlysecure.keychain.ui.util.Notify; import org.sufficientlysecure.keychain.util.Log; diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysProxyActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysProxyActivity.java index 29f2511a0..dc8752d1a 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysProxyActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysProxyActivity.java @@ -37,7 +37,7 @@ import com.google.zxing.integration.android.IntentResult; import org.sufficientlysecure.keychain.Constants; import org.sufficientlysecure.keychain.R; -import org.sufficientlysecure.keychain.api.OpenKeychainIntents; +import org.sufficientlysecure.keychain.intents.OpenKeychainIntents; import org.sufficientlysecure.keychain.keyimport.ParcelableKeyRing; import org.sufficientlysecure.keychain.operations.results.ImportKeyResult; import org.sufficientlysecure.keychain.operations.results.OperationResult; diff --git a/build.gradle b/build.gradle index baa1f8d97..4fc97ff6d 100644 --- a/build.gradle +++ b/build.gradle @@ -7,6 +7,8 @@ buildscript { // NOTE: Always use fixed version codes not dynamic ones, e.g. 0.7.3 instead of 0.7.+, see README for more information classpath 'com.android.tools.build:gradle:1.1.3' classpath files('gradle-witness.jar') + // bintray dependency to satisfy dependency of openpgp-api lib + classpath 'com.novoda:bintray-release:0.2.7' } } diff --git a/extern/openkeychain-api-lib b/extern/openkeychain-api-lib index 925907502..2a6cc7999 160000 --- a/extern/openkeychain-api-lib +++ b/extern/openkeychain-api-lib @@ -1 +1 @@ -Subproject commit 9259075028e0906d0cb085e0c4578e23829dc3c0 +Subproject commit 2a6cc7999f35c6e85e80ab6f98965d0e64974a99 diff --git a/extern/openpgp-api-lib b/extern/openpgp-api-lib index 70259ab74..31e6bfe01 160000 --- a/extern/openpgp-api-lib +++ b/extern/openpgp-api-lib @@ -1 +1 @@ -Subproject commit 70259ab74889fb5b785da0afc74259816f0b34bf +Subproject commit 31e6bfe0163ec886b5e9a6019410525f1017167a diff --git a/settings.gradle b/settings.gradle index 19f651b89..7256a205b 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,6 +1,6 @@ include ':OpenKeychain' -include ':extern:openpgp-api-lib' -include ':extern:openkeychain-api-lib' +include ':extern:openpgp-api-lib:openpgp-api' +include ':extern:openkeychain-api-lib:openkeychain-intents' include ':extern:spongycastle:core' include ':extern:spongycastle:pg' include ':extern:spongycastle:pkix'