From 723f626885d909694ef89b071967abffbe0a5b3d Mon Sep 17 00:00:00 2001 From: Anthony Gordon Date: Fri, 30 Oct 2020 22:07:40 +0000 Subject: [PATCH] v2.2.2 tweaks and dependency updates --- LabelStoreMax/CHANGELOG.md | 5 +++++ LabelStoreMax/android/app/build.gradle | 19 +------------------ .../android/app/src/debug/AndroidManifest.xml | 2 +- .../android/app/src/main/AndroidManifest.xml | 6 +++--- .../MainActivity.kt | 2 +- .../app/src/profile/AndroidManifest.xml | 2 +- LabelStoreMax/android/build.gradle | 3 --- LabelStoreMax/pubspec.lock | 17 ++++++++++++----- LabelStoreMax/pubspec.yaml | 4 ++-- README.md | 6 +++--- 10 files changed, 29 insertions(+), 37 deletions(-) rename LabelStoreMax/android/app/src/main/kotlin/com/woosignal/{label_storemax => android}/MainActivity.kt (72%) diff --git a/LabelStoreMax/CHANGELOG.md b/LabelStoreMax/CHANGELOG.md index 002bed3..7d101af 100644 --- a/LabelStoreMax/CHANGELOG.md +++ b/LabelStoreMax/CHANGELOG.md @@ -1,3 +1,8 @@ +## [2.2.2] - 2020-10-30 + +* Bug fix for Android build +* Pubspec.yaml dependency updates + ## [2.2.1] - 2020-10-22 * Minimum IOS deployment now IOS13 diff --git a/LabelStoreMax/android/app/build.gradle b/LabelStoreMax/android/app/build.gradle index 8cd5f3a..ba6f08e 100644 --- a/LabelStoreMax/android/app/build.gradle +++ b/LabelStoreMax/android/app/build.gradle @@ -25,12 +25,6 @@ apply plugin: 'com.android.application' apply plugin: 'kotlin-android' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" -def keystoreProperties = new Properties() -def keystorePropertiesFile = rootProject.file('key.properties') -if (keystorePropertiesFile.exists()) { - keystoreProperties.load(new FileInputStream(keystorePropertiesFile)) -} - android { compileSdkVersion 29 @@ -52,15 +46,6 @@ android { multiDexEnabled true } - signingConfigs { - release { - keyAlias keystoreProperties['keyAlias'] - keyPassword keystoreProperties['keyPassword'] - storeFile keystoreProperties['storeFile'] ? file(keystoreProperties['storeFile']) : null - storePassword keystoreProperties['storePassword'] - } - } - buildTypes { release { // TODO: Add your own signing config for the release build. @@ -72,8 +57,6 @@ android { // Also check out https://flutter.dev/docs/deployment/android // Set the key.properties when building apk or appbundle - // signingConfig signingConfigs.release - signingConfig signingConfigs.debug } } @@ -86,4 +69,4 @@ flutter { dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" implementation 'com.android.support:multidex:1.0.3' -} \ No newline at end of file +} diff --git a/LabelStoreMax/android/app/src/debug/AndroidManifest.xml b/LabelStoreMax/android/app/src/debug/AndroidManifest.xml index 53c1bbc..9568c71 100644 --- a/LabelStoreMax/android/app/src/debug/AndroidManifest.xml +++ b/LabelStoreMax/android/app/src/debug/AndroidManifest.xml @@ -1,5 +1,5 @@ + package="com.woosignal.android"> diff --git a/LabelStoreMax/android/app/src/main/AndroidManifest.xml b/LabelStoreMax/android/app/src/main/AndroidManifest.xml index b176c40..269fa3f 100644 --- a/LabelStoreMax/android/app/src/main/AndroidManifest.xml +++ b/LabelStoreMax/android/app/src/main/AndroidManifest.xml @@ -1,5 +1,5 @@ + package="com.woosignal.android"> diff --git a/LabelStoreMax/android/build.gradle b/LabelStoreMax/android/build.gradle index 71eb9a2..3100ad2 100644 --- a/LabelStoreMax/android/build.gradle +++ b/LabelStoreMax/android/build.gradle @@ -3,9 +3,6 @@ buildscript { repositories { google() jcenter() - maven { - url "https://maven.google.com" - } } dependencies { diff --git a/LabelStoreMax/pubspec.lock b/LabelStoreMax/pubspec.lock index 3089616..6348bae 100644 --- a/LabelStoreMax/pubspec.lock +++ b/LabelStoreMax/pubspec.lock @@ -112,14 +112,21 @@ packages: name: device_info url: "https://pub.dartlang.org" source: hosted - version: "0.4.2+4" + version: "0.4.2+9" + device_info_platform_interface: + dependency: transitive + description: + name: device_info_platform_interface + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.1" dio: dependency: transitive description: name: dio url: "https://pub.dartlang.org" source: hosted - version: "3.0.9" + version: "3.0.10" edge_alert: dependency: "direct main" description: @@ -461,7 +468,7 @@ packages: name: shared_preferences url: "https://pub.dartlang.org" source: hosted - version: "0.5.12" + version: "0.5.12+2" shared_preferences_linux: dependency: transitive description: @@ -634,7 +641,7 @@ packages: name: uuid url: "https://pub.dartlang.org" source: hosted - version: "2.1.0" + version: "2.2.2" vector_math: dependency: transitive description: @@ -655,7 +662,7 @@ packages: name: woosignal url: "https://pub.dartlang.org" source: hosted - version: "1.2.0" + version: "1.2.1" woosignal_stripe: dependency: "direct main" description: diff --git a/LabelStoreMax/pubspec.yaml b/LabelStoreMax/pubspec.yaml index 07ff7ae..26a1312 100644 --- a/LabelStoreMax/pubspec.yaml +++ b/LabelStoreMax/pubspec.yaml @@ -1,7 +1,7 @@ # Official WooSignal App Template for WooCommerce # Label StoreMax -# Version 2.2.1 +# Version 2.2.2 # Homepage: https://woosignal.com # Author: Anthony Gordon # Documentation: https://woosignal.com/docs/app/ios/label-storemax @@ -27,7 +27,7 @@ environment: sdk: ">=2.1.0 <3.0.0" dependencies: - woosignal: ^1.2.0 + woosignal: ^1.2.1 woosignal_stripe: ^0.0.6 razorpay_flutter: ^1.2.2 wp_json_api: ^0.1.4 diff --git a/README.md b/README.md index 65e3f1e..141f13d 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ # WooCommerce App: Label StoreMax -### Label StoreMax - v2.2.1 +### Label StoreMax - v2.2.2 [Official WooSignal WooCommerce App](https://woosignal.com) @@ -26,8 +26,8 @@ Label StoreMax is a WooCommerce Flutter App template, built exclusively for onli - App Store Ready - One config file -- Login/register via WordPress -- Stripe, Cash on delivery, RazorPay +- Login/Register via WordPress +- Stripe, Cash On Delivery, RazorPay - Localized for en, es, pt, it, hi, fr ## Security Vulnerabilities