From b4465c388d480a5470f46dbfc0d242e08f5442bc Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Tue, 24 Dec 2019 17:11:34 +0100
Subject: [PATCH] Revert "Build OpenKeychain API / autocrypt inline"

This reverts commit 6bee184f098a500f51137e1849e9e81e0e6e8d13.
---
 .gitmodules      | 3 ---
 app/build.gradle | 3 +--
 build.gradle     | 2 --
 openpgp-api      | 1 -
 settings.gradle  | 3 +--
 5 files changed, 2 insertions(+), 10 deletions(-)
 delete mode 160000 openpgp-api

diff --git a/.gitmodules b/.gitmodules
index 776ed2490f..d9a0823da5 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,3 @@
 [submodule "qcolorpicker"]
 	path = qcolorpicker
 	url = https://github.com/QuadFlask/colorpicker.git
-[submodule "openpgp-api"]
-	path = openpgp-api
-	url = https://github.com/open-keychain/openpgp-api.git
diff --git a/app/build.gradle b/app/build.gradle
index 4698c30df7..4cae5a1af4 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -299,8 +299,7 @@ dependencies {
 
     // https://github.com/open-keychain/openpgp-api
     // https://mvnrepository.com/artifact/org.sufficientlysecure/openpgp-api
-    //implementation "org.sufficientlysecure:openpgp-api:$openpgp_version"
-    implementation project(':openpgp-api')
+    implementation "org.sufficientlysecure:openpgp-api:$openpgp_version"
 
     // https://www.sqlite.org/changes.html
     // https://github.com/requery/sqlite-android/
diff --git a/build.gradle b/build.gradle
index 8eb2b31131..a174eef2bf 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,8 +8,6 @@ buildscript {
         classpath 'com.android.tools.build:gradle:3.5.3'
         // https://github.com/bugsnag/bugsnag-android-gradle-plugin
         classpath 'com.bugsnag:bugsnag-android-gradle-plugin:4.5.2'
-        // open-keychain
-        classpath 'com.novoda:bintray-release:0.8.0'
     }
 }
 
diff --git a/openpgp-api b/openpgp-api
deleted file mode 160000
index 3994abb154..0000000000
--- a/openpgp-api
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 3994abb154a38374be666f58a7767e10850dda76
diff --git a/settings.gradle b/settings.gradle
index 5dd724a506..e7b4def49c 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,2 +1 @@
-include ':app', ':openpgp-api'
-project(':openpgp-api').projectDir = new File('openpgp-api/openpgp-api')
+include ':app'