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.
---
 wallet/.gitlab-ci.yml |  1 -
 wallet/README.md      | 21 ++++++---------------
 wallet/build.gradle   |  2 +-
 3 files changed, 7 insertions(+), 17 deletions(-)

(limited to 'wallet')

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