[taler-taler-android] branch master updated (fe5f6f8 -> d3955c2)

[gnunet]

This is an automated email from the git hooks/post-receive script.

torsten-grote pushed a change to branch master
in repository taler-android.

    from fe5f6f8  mostly disable proguard
     new 786f59b  rename multi-platform submodule
     new d3955c2  Add README files to top-level and update the project ones

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .gitmodules                       |  2 +-
 .idea/codeStyles/Project.xml      | 11 ++++++++++-
 .idea/compiler.xml                |  2 --
 .idea/gradle.xml                  |  4 ++--
 README.md                         | 38 ++++++++++++++++++++++++++++++++++++++
 cashier/README.md                 |  8 ++++++--
 merchant-terminal/README.md       | 18 ++++++++++++++++++
 wallet-kotlin => multiplatform    |  0
 settings.gradle                   |  2 +-
 taler-kotlin-android/build.gradle |  4 ++--
 wallet/README.md                  | 11 ++++++++---
 wallet/build.gradle               |  2 +-
 12 files changed, 87 insertions(+), 15 deletions(-)
 create mode 100644 README.md
 create mode 100644 merchant-terminal/README.md
 rename wallet-kotlin => multiplatform (100%)

diff --git a/.gitmodules b/.gitmodules
index 7171b3d..29c8ad2 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "wallet-kotlin"]
-       path = wallet-kotlin
+       path = multiplatform
        url = git://git.taler.net/wallet-kotlin.git
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index dfca6e5..b23c749 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -3,7 +3,16 @@
     <JetCodeStyleSettings>
       <option name="PACKAGES_TO_USE_STAR_IMPORTS">
         <value>
-          <package name="kotlinx.android.synthetic" withSubpackages="true" 
static="false" />
+          <package name="kotlinx.android.synthetic" alias="false" 
withSubpackages="true" />
+        </value>
+      </option>
+      <option name="PACKAGES_IMPORT_LAYOUT">
+        <value>
+          <package name="" alias="false" withSubpackages="true" />
+          <package name="java" alias="false" withSubpackages="true" />
+          <package name="javax" alias="false" withSubpackages="true" />
+          <package name="kotlin" alias="false" withSubpackages="true" />
+          <package name="" alias="true" withSubpackages="true" />
         </value>
       </option>
       <option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="2147483647" />
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index b209367..2b48706 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -12,8 +12,6 @@
       <entry name="!?*.clj" />
     </wildcardResourcePatterns>
     <bytecodeTargetLevel>
-      <module name="common_jvmMain" target="1.6" />
-      <module name="common_jvmTest" target="1.6" />
       <module name="taler-kotlin-common_jvmMain" target="1.6" />
       <module name="taler-kotlin-common_jvmTest" target="1.6" />
     </bytecodeTargetLevel>
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 25f810e..b5fb24f 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -14,10 +14,10 @@
             <option value="$PROJECT_DIR$/cashier" />
             <option value="$PROJECT_DIR$/merchant-lib" />
             <option value="$PROJECT_DIR$/merchant-terminal" />
+            <option value="$PROJECT_DIR$/multiplatform" />
+            <option value="$PROJECT_DIR$/multiplatform/common" />
             <option value="$PROJECT_DIR$/taler-kotlin-android" />
             <option value="$PROJECT_DIR$/wallet" />
-            <option value="$PROJECT_DIR$/wallet-kotlin" />
-            <option value="$PROJECT_DIR$/wallet-kotlin/common" />
           </set>
         </option>
         <option name="resolveModulePerSourceSet" value="false" />
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..cdc9574
--- /dev/null
+++ b/README.md
@@ -0,0 +1,38 @@
+# GNU Taler Android Code Repository
+
+This git repository contains code for GNU Taler Android apps and libraries.
+The official location is: 
+
+    https://git.taler.net/taler-android.git
+    
+## Structure
+
+* [**anastasis-ui**](/anastasis-ui) - an Android library for sync and backup 
UI.
+  See [Anastasis](https://docs.taler.net/anastasis.html).
+* [**cashier**](/cashier) - an Android app that enables you to take cash and 
give out electronic cash
+* [**merchant-lib**](/merchant-lib) - a library providing communication with a 
merchant backend
+  to be used by the point of sale app below.
+* [**merchant-terminal**](/merchant-terminal) - a merchant point of sale 
terminal Android app
+  that allows sellers to
+  process customers’ orders by adding or removing products,
+  calculate the amount owed by the customer
+  and let the customer make a Taler payment via QR code or NFC.
+* [**taler-kotlin-android**](/taler-kotlin-android) - an Android library 
containing common code
+  needed by more than one Taler Android app.
+* [**multiplatform**](/multiplatform) - multi-platform Taler libraries
+  included as a [git submodule](https://git-scm.com/docs/git-submodule)
+  from 
[`https://git.taler.net/wallet-kotlin.git`](https://git.taler.net/wallet-kotlin.git/)
+* [**wallet**](/wallet) - a GNU Taler wallet Android app
+
+## Building
+
+Before building anything, you should initialize and update the submodules by 
running
+    
+    $ ./bootstrap
+    
+Then, you can get a list of possible build tasks like this:
+    
+    $ ./gradlew tasks
+    
+See the [Taler developer 
manual](https://docs.taler.net/developers-manual.html#build-apps-from-source).
+for more information about building individual apps.
diff --git a/cashier/README.md b/cashier/README.md
index e884f25..4382125 100644
--- a/cashier/README.md
+++ b/cashier/README.md
@@ -5,6 +5,10 @@ The purpose of this app is to enable people (a cashier) to 
take cash and give ou
 ## Building
 
 You can import the project into Android Studio
-or build it with Gradle on the command line:
+or build it with Gradle on the command line (from the repository root):
 
-    $ ./gradlew build
+    $ ./bootstrap
+    $ ./gradlew :cashier:build
+
+More information can be found in the
+[Taler developer 
manual](https://docs.taler.net/developers-manual.html#build-apps-from-source).
diff --git a/merchant-terminal/README.md b/merchant-terminal/README.md
new file mode 100644
index 0000000..51aff01
--- /dev/null
+++ b/merchant-terminal/README.md
@@ -0,0 +1,18 @@
+# GNU Taler Point of Sale merchant terminal
+
+This merchant point of sale terminal Android app allows sellers to
+
+* process customers’ orders by adding or removing products,
+* calculate the amount owed by the customer and
+* let the customer make a Taler payment via QR code or NFC.
+
+## Building
+
+You can import the project into Android Studio
+or build it with Gradle on the command line (from the repository root):
+
+    $ ./bootstrap
+    $ ./gradlew :merchant-terminal:build
+
+More information can be found in the
+[Taler developer 
manual](https://docs.taler.net/developers-manual.html#build-apps-from-source).
diff --git a/wallet-kotlin b/multiplatform
similarity index 100%
rename from wallet-kotlin
rename to multiplatform
diff --git a/settings.gradle b/settings.gradle
index 1e16e26..016a7ea 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,4 +1,4 @@
-include ':wallet-kotlin:common'
+include ':multiplatform:common'
 include ':cashier', ':merchant-terminal', ':wallet'
 include ':taler-kotlin-android'
 include ':merchant-lib'
diff --git a/taler-kotlin-android/build.gradle 
b/taler-kotlin-android/build.gradle
index e6a376c..ca4df8a 100644
--- a/taler-kotlin-android/build.gradle
+++ b/taler-kotlin-android/build.gradle
@@ -50,7 +50,7 @@ android {
 }
 
 dependencies {
-    api project(":wallet-kotlin:common")
+    api project(":multiplatform:common")
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
     implementation 'androidx.appcompat:appcompat:1.2.0'
@@ -73,5 +73,5 @@ dependencies {
     lintPublish 'com.github.thirdegg:lint-rules:0.0.4-alpha'
 
     testImplementation 'junit:junit:4.13'
-    testImplementation 'org.json:json:20190722'
+    testImplementation 'org.json:json:20200518'
 }
diff --git a/wallet/README.md b/wallet/README.md
index 22e283f..32e2139 100644
--- a/wallet/README.md
+++ b/wallet/README.md
@@ -1,10 +1,15 @@
 # GNU Taler Wallet
 
 This package implements a GNU Taler wallet for Android.
-It is currently a UI for the wallet library writen in TypeScript.
+It is currently a UI for the
+[wallet library written in TypeScript](https://git.taler.net/wallet-core.git).
 
 ## Building
 
-It can be built with Gradle:
+It can be built from the project's main directory with Gradle:
 
-    $ ./gradlew build
+    $ ./bootstrap
+    $ ./gradlew :wallet:build
+
+More information can be found in the
+[Taler developer 
manual](https://docs.taler.net/developers-manual.html#build-apps-from-source).
diff --git a/wallet/build.gradle b/wallet/build.gradle
index 495d535..87019f8 100644
--- a/wallet/build.gradle
+++ b/wallet/build.gradle
@@ -48,7 +48,7 @@ android {
         minSdkVersion 24
         targetSdkVersion 29
         versionCode 6
-        versionName "0.7.1.dev.20"
+        versionName "0.7.1.dev.21"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         buildConfigField "String", "WALLET_CORE_VERSION", 
"\"$walletCoreVersion\""
     }

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.