Merge branch 'master' into feature/GestureManager

Author: ajungg

.github/workflows/build.yml

@@ -12,11 +12,9 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-      - name: Set up JDK 1.8
+      - name: Set up JDK 12
         uses: actions/setup-java@v1
         with:
-          java-version: 1.8
-      - name: Grant execute permission for gradlew
-        run: chmod +x gradlew
+          java-version: 12
       - name: Build
         run: ./gradlew build

.github/workflows/publish.yml

@@ -10,12 +10,10 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-      - name: Set up JDK 1.8
+      - name: Set up JDK 12
         uses: actions/setup-java@v1
         with:
-          java-version: 1.8
-      - name: Grant execute permission for gradlew
-        run: chmod +x gradlew
+          java-version: 12
       - name: Build
         run: ./gradlew build
       - name: Publish to Maven Repository

CHANGELOG.md

@@ -1,6 +1,103 @@
 # Changelog  
 All notable changes to this project will be documented in this file.
 
+## [0.39.7]
+
+### Fixed
+- Reversed camera torch drawable
+
+## [0.39.6]
+
+### Added
+- Added support for "manualDiscountFinalCode"
+
+## [0.39.5]
+
+### Fixed
+- QR codes being cutoff when maxSizeMM is higher than available view space
+- Payment methods being shown to project that are not part of the project
+
+### Updated
+- Updated Datatrans SDK to v1.4.1
+
+## [0.39.4]
+
+### Added
+- Add configuration flag `isUsingShoppingList` to avoid creating a FTS when not required
+
+## [0.39.3]
+
+### Fixed
+- Fixed checkouts not aborting when age verification check is not passing
+
+## [0.39.2]
+
+### Fixed
+- Added package query for Android 11+
+
+## [0.39.1]
+
+### Added
+- Jump to play store if google pay is not installed
+
+## [0.39.0]
+
+### Added
+- Added support for Google Pay
+
+### Fixed
+- Fixed exceptions when using coupons that affect the whole cart
+
+## [0.38.1]
+
+### Updated
+- Updated Datatrans SDK to v1.4.0
+
+### Fixed
+- Product searches of sku's are now also working on pressing the imeActionDone.
+
+## [0.38.0]
+
+### Added
+- Added stackable scan messages with a new Style
+
+### Deprecated
+- Deprecated UIUtils.showTopDownInfoBox
+
+## [0.37.12]
+
+### Added
+- Added indicator if an manual discount was applied or not
+
+### Fixed
+- Fixed pull to refresh in ShoppingCartView
+- Fixed selecting manual discounts resetting amount, even when no item is already in cart
+- Products with manual discounts are now editable
+
+## [0.37.11]
+
+### Fixed
+- Fixed crash when no TWINT or PostFinance payment method could be added
+
+## [0.37.10]
+
+### Changed
+- Changed default Datatrans environment to Production
+
+### Fixed
+- Fixed listing of TWINT and PostFinace Card payment methods when no credit card payment
+methods are available
+
+## [0.37.9]
+
+### Changed
+- Made credit card 3d secure hint locale aware
+
+## [0.37.8]
+
+### Fixed
+- Only update cart when it actually changed
+
 ## [0.37.7]
 
 ### Added

build.gradle

@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = "1.5.10"
+    ext.kotlin_version = "1.5.20"
 
     repositories {
         google()
@@ -12,7 +12,7 @@ buildscript {
 
     dependencies {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath 'com.android.tools.build:gradle:4.2.1'
+        classpath 'com.android.tools.build:gradle:4.2.2'
         classpath 'gradle.plugin.com.github.jlouns:gradle-cross-platform-exec-plugin:0.5.0'
         classpath "gradle.plugin.gmazzo:sqlite-plugin:0.2"
     }
@@ -31,7 +31,7 @@ allprojects {
     }
 
     project.ext {
-        sdkVersion='0.37.7'
+        sdkVersion='0.39.7'
         versionCode=1
 
         compileSdkVersion=30

core/build.gradle

@@ -40,25 +40,33 @@ android {
         freeCompilerArgs = ["-Xjvm-default=all"]
         jvmTarget = "1.8"
     }
+
+    testOptions {
+        unitTests {
+            includeAndroidResources = true
+        }
+    }
 }
 
 dependencies {
     coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:${project.desugarVersion}"
 
     implementation project(':utils')
 
-    implementation 'androidx.appcompat:appcompat:1.2.0'
+    implementation 'androidx.appcompat:appcompat:1.3.0'
     implementation 'commons-io:commons-io:2.5'
     implementation 'org.apache.commons:commons-lang3:3.8.1'
     implementation 'org.iban4j:iban4j:3.2.1'
     implementation "com.squareup.okhttp3:logging-interceptor:${project.okhttpVersion}"
     implementation 'com.caverock:androidsvg-aar:1.4'
-    implementation("androidx.datastore:datastore-preferences:1.0.0-beta01")
+    implementation 'com.google.android.gms:play-services-wallet:18.1.3'
 
     api "com.squareup.okhttp3:okhttp:${project.okhttpVersion}"
     api 'com.google.code.gson:gson:2.8.6'
 
-    testImplementation 'junit:junit:4.13'
+    testImplementation 'junit:junit:4.13.2'
+    testImplementation 'org.robolectric:robolectric:4.5.1'
+    testImplementation "com.squareup.okhttp3:mockwebserver:${project.okhttpVersion}"
 
     androidTestImplementation 'androidx.test:rules:1.3.0'
     androidTestImplementation 'androidx.test:runner:1.3.0'

core/src/main/AndroidManifest.xml

@@ -2,4 +2,13 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="io.snabble.sdk">
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+
+    <application>
+        <activity android:name=".googlepay.GooglePayHelperActivity"
+            android:theme="@style/Snabble.Theme.GooglePayOverlay"/>
+    </application>
+
+    <queries>
+        <package android:name="com.google.android.apps.walletnfcrel" />
+    </queries>
 </manifest>