From d4fedb48e4916e6cffc02b6f39bf25271c609bf1 Mon Sep 17 00:00:00 2001
From: Boris Kraut <krt@nurfuerspam.de>
Date: Sat, 13 Jun 2015 00:23:11 +0200
Subject: [PATCH] Fwknop2: Fix build

---
 metadata/org.cipherdyne.fwknop2.txt | 20 +++++++++++---------
 srclibs/juicessh-plugin-library.txt |  2 ++
 2 files changed, 13 insertions(+), 9 deletions(-)
 create mode 100644 srclibs/juicessh-plugin-library.txt

diff --git a/metadata/org.cipherdyne.fwknop2.txt b/metadata/org.cipherdyne.fwknop2.txt
index 8f6cfa62a9..62f93b7bd5 100644
--- a/metadata/org.cipherdyne.fwknop2.txt
+++ b/metadata/org.cipherdyne.fwknop2.txt
@@ -16,21 +16,23 @@ also includes the ability to import keys via QR codes.
 Repo Type:git
 Repo:https://github.com/oneru/fwknop2.git
 
-Build:v1.0-Beta.2,1
-    disable=custom maven repo
-    commit=f5d0739a006b1f7b02c9606ff33296af92470294
+Build:1.0,3
+    commit=83416b654afd17c1e35d3f4b82fd109d8a8cf32c
     subdir=app
-    prebuild=sed -i -e '@raw.github.com/Sonelli/maven@g' build.gradle
-    buildjni=yes
+    prebuild=sed -i -e '/raw.github.com\/Sonelli\/maven/d' build.gradle && sed -i -e '/jcenter/amavenLocal()' ../build.gradle && \
+        pushd $$juicessh-plugin-library$$ && sed -i -e '/Dropbox/d' -e '/groupId/irepository(url: mavenLocal().url)' build.gradle && gradle uploadArchives && popd
+    buildjni=no
+    srclibs=juicessh-plugin-library@cf1a9c3494f15c324fbb1e373b49b1b3a79b1926
+    gradle=yes
 
 Maintainer Notes:
-TODO: build com.sonelli:juicessh-pluginlibrary:1.0.+@aar from source
-see https://github.com/Sonelli/juicessh-performancemonitor/tree/master/Plugin
-see https://github.com/Sonelli/juicessh-pluginexample
+Gradle introduced a packageId along with app id. While they are commonly the
+same, it's okay for them to mismatch. We need to fix this in our updates. So
+right now, UCM is disabled.
 .
 
 Auto Update Mode:None
-Update Check Mode:Tags
+Update Check Mode:None
 Current Version:v1.0-Beta.2,1
 Current Version Code:1
 
diff --git a/srclibs/juicessh-plugin-library.txt b/srclibs/juicessh-plugin-library.txt
new file mode 100644
index 0000000000..e3b0ab1db1
--- /dev/null
+++ b/srclibs/juicessh-plugin-library.txt
@@ -0,0 +1,2 @@
+Repo Type:git
+Repo:https://github.com/Sonelli/juicessh-pluginlibrary/