Revert "Build OpenKeychain API / autocrypt inline"

M66B · M66B · commit b4465c388d48 · 2019-12-24T17:11:34.000+01:00
This reverts commit 6bee184.
diff --git 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
@@ -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
@@ -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
diff --git 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'

Original file line number	Diff line number	Diff line change
`@@ -8,8 +8,6 @@ buildscript {`
`8`	`8`	`classpath 'com.android.tools.build:gradle:3.5.3'`
`9`	`9`	`// https://github.com/bugsnag/bugsnag-android-gradle-plugin`
`10`	`10`	`classpath 'com.bugsnag:bugsnag-android-gradle-plugin:4.5.2'`
`11`		`- // open-keychain`
`12`		`- classpath 'com.novoda:bintray-release:0.8.0'`
`13`	`11`	`}`
`14`	`12`	`}`
`15`	`13`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1 @@`
`1`		`-include ':app', ':openpgp-api'`
`2`		`-project(':openpgp-api').projectDir = new File('openpgp-api/openpgp-api')`
	`1`	`+include ':app'`