From 20b1d2677462090a08edda99d042dbcddc9f8c11 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Fri, 10 Apr 2020 09:51:46 -0300
Subject: [wallet] move akono into a normal gradle dependency

This removes the need to manually copy a binary blob
and should also make F-Droid inclusion easier.
---
 .gitignore            |  1 -
 .idea/gradle.xml      |  1 -
 akono/.gitignore      |  1 -
 akono/build.gradle    | 18 ------------------
 settings.gradle       | 18 +-----------------
 wallet/.gitlab-ci.yml |  1 -
 wallet/README.md      | 21 ++++++---------------
 wallet/build.gradle   |  2 +-
 8 files changed, 8 insertions(+), 55 deletions(-)
 delete mode 100644 akono/.gitignore
 delete mode 100644 akono/build.gradle

diff --git a/.gitignore b/.gitignore
index 52aa44f..84587f2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,5 +15,4 @@
 /captures
 .externalNativeBuild
 .cxx
-/akono/akono.aar
 /*/release/
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 603ebc0..d14ac7f 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -10,7 +10,6 @@
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
-            <option value="$PROJECT_DIR$/akono" />
             <option value="$PROJECT_DIR$/cashier" />
             <option value="$PROJECT_DIR$/merchant-terminal" />
             <option value="$PROJECT_DIR$/taler-kotlin-common" />
diff --git a/akono/.gitignore b/akono/.gitignore
deleted file mode 100644
index 796b96d..0000000
--- a/akono/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build
diff --git a/akono/build.gradle b/akono/build.gradle
deleted file mode 100644
index 45fbf89..0000000
--- a/akono/build.gradle
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * This file is part of GNU Taler
- * (C) 2020 Taler Systems S.A.
- *
- * GNU Taler is free software; you can redistribute it and/or modify it under the
- * terms of the GNU General Public License as published by the Free Software
- * Foundation; either version 3, or (at your option) any later version.
- *
- * GNU Taler is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * GNU Taler; see the file COPYING.  If not, see <http://www.gnu.org/licenses/>
- */
-
-configurations.maybeCreate("default")
-artifacts.add("default", file('akono.aar'))
\ No newline at end of file
diff --git a/settings.gradle b/settings.gradle
index f254aa2..b0e66eb 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,18 +1,2 @@
-/*
- * This file is part of GNU Taler
- * (C) 2020 Taler Systems S.A.
- *
- * GNU Taler is free software; you can redistribute it and/or modify it under the
- * terms of the GNU General Public License as published by the Free Software
- * Foundation; either version 3, or (at your option) any later version.
- *
- * GNU Taler is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * GNU Taler; see the file COPYING.  If not, see <http://www.gnu.org/licenses/>
- */
-
-include ':akono', ':cashier', ':merchant-terminal', ':wallet'
+include ':cashier', ':merchant-terminal', ':wallet'
 include ':taler-kotlin-common'
diff --git a/wallet/.gitlab-ci.yml b/wallet/.gitlab-ci.yml
index 477acca..bbc478a 100644
--- a/wallet/.gitlab-ci.yml
+++ b/wallet/.gitlab-ci.yml
@@ -1,6 +1,5 @@
 .binary_deps:
   before_script:
-    - wget "https://git.taler.net/wallet-android.git/plain/akono.aar?h=binary-deps" -O akono/akono.aar
     - mkdir -p app/src/main/assets
     - wget "https://git.taler.net/wallet-android.git/plain/taler-wallet-android.js?h=binary-deps" -O app/src/main/assets/taler-wallet-android.js
 
diff --git a/wallet/README.md b/wallet/README.md
index 63b128b..e4cee9c 100644
--- a/wallet/README.md
+++ b/wallet/README.md
@@ -1,40 +1,31 @@
-GNU Taler Wallet
-================
+# GNU Taler Wallet
 
 This package implements a GNU Taler wallet for Android.
 It is currently a UI for the wallet writen in TypeScript.
 
+## Building
 
-Building
-========
+Currently, building the wallet for Android requires manually copying a dependency:
 
-Currently, building the wallet for Android requires manually copying two
-dependencies:
-
-`akono.aar` -> `../akono/akono.aar`
 `taler-wallet-android.js` -> `src/main/assets/taler-wallet-android.js`
 
 After that, the Android wallet can be built with Gradle:
 
     $ ./gradlew build
 
-
-Obtaining Dependencies
-======================
+## Obtaining Dependencies
 
 There are two ways of obtaining the dependencies.  The easiest one is
 to use the pre-built versions, which are stored in the "binary-deps"
-branch of this repository.
+branch of the git://git.taler.net/wallet-android.git repository.
 
 An easy way to access them is using a git worktree:
 
     $ git fetch origin binary-deps
     $ git worktree add binary-deps binary-deps
-    $ cp binary-deps/akono.aar ../akono/akono.aar
     $ cp binary-deps/taler-wallet-android.js src/main/assets/taler-wallet-android.js
     $ git worktree remove binary-deps
 
-Alternatively, you can build them yourself from the respective repositories:
+Alternatively, you can build it yourself from the repository:
 
- * git://git.taler.net/akono.git
  * git://git.taler.net/wallet-core.git
diff --git a/wallet/build.gradle b/wallet/build.gradle
index 3e8131a..3f9047e 100644
--- a/wallet/build.gradle
+++ b/wallet/build.gradle
@@ -57,8 +57,8 @@ android {
 }
 
 dependencies {
-    implementation project(":akono")
     implementation project(":taler-kotlin-common")
+    implementation 'net.taler:akono:0.1'
 
     implementation 'com.google.android.material:material:1.1.0'
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
-- 
cgit v1.2.3