6177214e-ce7c-49e3-99de-ff9721b26f63 — Commit cfd314d5
Changed files
comwell_key_app/android/app/build.gradle | 4 ++-- comwell_key_app/android/build.gradle | 5 +---- comwell_key_app/lib/welcome/welcome_repository.dart | 10 +++++----- mobilekeys_sdk_plugin/.vscode/settings.json | 3 +++ .../android/.gradle/7.3/checksums/checksums.lock | Bin 0 -> 17 bytes .../dependencies-accessors/dependencies-accessors.lock | Bin 0 -> 17 bytes .../.gradle/7.3/dependencies-accessors/gc.properties | 0 .../android/.gradle/7.3/fileChanges/last-build.bin | Bin 0 -> 1 bytes .../android/.gradle/7.3/fileHashes/fileHashes.lock | Bin 0 -> 17 bytes mobilekeys_sdk_plugin/android/.gradle/7.3/gc.properties | 0 .../.gradle/buildOutputCleanup/buildOutputCleanup.lock | Bin 17 -> 17 bytes .../android/.gradle/buildOutputCleanup/cache.properties | 4 ++-- mobilekeys_sdk_plugin/android/build.gradle | 5 ++++- .../android/gradle/wrapper/gradle-wrapper.properties | 2 +- 14 files changed, 18 insertions(+), 15 deletions(-)
Diff
diff --git a/comwell_key_app/android/app/build.gradle b/comwell_key_app/android/app/build.gradle
index c7172733..02100b92 100644
--- a/comwell_key_app/android/app/build.gradle
+++ b/comwell_key_app/android/app/build.gradle
@@ -101,7 +101,7 @@ flutter {
dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
//aar file from libs dir. Name and version is from the filename.
- debugImplementation fileTree(dir: '../../../android/libs', include: ['mobilekeys-android-sdk-debug-*.aar'])
- releaseImplementation fileTree(dir: '../../../android/libs', include: ['mobilekeys-android-sdk-release-*.aar'])
+ debugImplementation fileTree(dir: '../../..//mobilekeys_sdk_plugin/android/libs', include: ['mobilekeys-android-sdk-debug-*.aar'])
+ releaseImplementation fileTree(dir: '../../..//mobilekeys_sdk_plugin/android/libs', include: ['mobilekeys-android-sdk-release-*.aar'])
debugImplementation 'com.github.tony19:logback-android:3.0.0'
}
diff --git a/comwell_key_app/android/build.gradle b/comwell_key_app/android/build.gradle
index 7fe1bd16..c4cb6e55 100644
--- a/comwell_key_app/android/build.gradle
+++ b/comwell_key_app/android/build.gradle
@@ -9,7 +9,7 @@ buildscript {
classpath 'com.android.tools.build:gradle:7.4.2'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath "com.android.tools:r8:8.1.72"
- classpath files('libs/mobilekeys-android-sdk-debug-8.1.0.aar')
+ classpath files('mobilekeys-android-sdk-debug-8.1.0.aar')
}
}
@@ -17,9 +17,6 @@ allprojects {
repositories {
google()
mavenCentral()
- flatDir {
- dirs 'libs', '../libs'
- }
}
}
diff --git a/comwell_key_app/lib/welcome/welcome_repository.dart b/comwell_key_app/lib/welcome/welcome_repository.dart
index 5be5e08a..e6cd3179 100644
--- a/comwell_key_app/lib/welcome/welcome_repository.dart
+++ b/comwell_key_app/lib/welcome/welcome_repository.dart
@@ -15,20 +15,20 @@ final _secureStorage = SecureStorage();
Future<bool> startMobilePlugin() async {
- /* final mobileKeysOptions = {
+ final mobileKeysOptions = {
"MobileKeysOptionApplicationId": dotenv.env['MOBILEKEYSOPTIONAPPLICATIONID'],
"MobileKeysOptionAppDescription": dotenv.env['MOBILEKEYSOPTIONAPPDESCRIPTION'],
"MobileKeysOptionVersion": dotenv.env['MOBILEKEYSOPTIONVERSION'],
- "MobileKeysOptionLockServiceCodes": dotenv.env['MOBILEKEYSOPTIONLOCKSERVICECODES'],
+ "MobileKeysOptionLockServiceCodes": [1],
"MobileKeysOptionLogsMail": dotenv.env['MOBILEKEYSOPTIONLOGSMAIL'],
- }; */
- final mobileKeysOptions = {
+ };
+ /* final mobileKeysOptions = {
"MobileKeysOptionApplicationId": "Flutter Sample",
"MobileKeysOptionAppDescription": "ASSA ABLOY Mobile Keys Example Implementation",
"MobileKeysOptionVersion": "0.0.1",
"MobileKeysOptionLockServiceCodes": [1, 2],
"MobileKeysOptionLogsMail": "my.mail@mail.com",
- };
+ }; */
try {
await _seosMobileKeysPlugin.startUp(mobileKeysOptions);
bool? isEndPointSetup = await isEndpointSetup();
diff --git a/mobilekeys_sdk_plugin/.vscode/settings.json b/mobilekeys_sdk_plugin/.vscode/settings.json
new file mode 100644
index 00000000..c5f3f6b9
--- /dev/null
+++ b/mobilekeys_sdk_plugin/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+ "java.configuration.updateBuildConfiguration": "interactive"
+}
\ No newline at end of file
diff --git a/mobilekeys_sdk_plugin/android/.gradle/7.3/checksums/checksums.lock b/mobilekeys_sdk_plugin/android/.gradle/7.3/checksums/checksums.lock
new file mode 100644
index 00000000..ae747426
Binary files /dev/null and b/mobilekeys_sdk_plugin/android/.gradle/7.3/checksums/checksums.lock differ
diff --git a/mobilekeys_sdk_plugin/android/.gradle/7.3/dependencies-accessors/dependencies-accessors.lock b/mobilekeys_sdk_plugin/android/.gradle/7.3/dependencies-accessors/dependencies-accessors.lock
new file mode 100644
index 00000000..3b40a3d1
Binary files /dev/null and b/mobilekeys_sdk_plugin/android/.gradle/7.3/dependencies-accessors/dependencies-accessors.lock differ
diff --git a/mobilekeys_sdk_plugin/android/.gradle/7.3/dependencies-accessors/gc.properties b/mobilekeys_sdk_plugin/android/.gradle/7.3/dependencies-accessors/gc.properties
new file mode 100644
index 00000000..e69de29b
diff --git a/mobilekeys_sdk_plugin/android/.gradle/7.3/fileChanges/last-build.bin b/mobilekeys_sdk_plugin/android/.gradle/7.3/fileChanges/last-build.bin
new file mode 100644
index 00000000..f76dd238
Binary files /dev/null and b/mobilekeys_sdk_plugin/android/.gradle/7.3/fileChanges/last-build.bin differ
diff --git a/mobilekeys_sdk_plugin/android/.gradle/7.3/fileHashes/fileHashes.lock b/mobilekeys_sdk_plugin/android/.gradle/7.3/fileHashes/fileHashes.lock
new file mode 100644
index 00000000..03d5e477
Binary files /dev/null and b/mobilekeys_sdk_plugin/android/.gradle/7.3/fileHashes/fileHashes.lock differ
diff --git a/mobilekeys_sdk_plugin/android/.gradle/7.3/gc.properties b/mobilekeys_sdk_plugin/android/.gradle/7.3/gc.properties
new file mode 100644
index 00000000..e69de29b
diff --git a/mobilekeys_sdk_plugin/android/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/mobilekeys_sdk_plugin/android/.gradle/buildOutputCleanup/buildOutputCleanup.lock
index 125ec01d..6404be7d 100644
Binary files a/mobilekeys_sdk_plugin/android/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/mobilekeys_sdk_plugin/android/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ
diff --git a/mobilekeys_sdk_plugin/android/.gradle/buildOutputCleanup/cache.properties b/mobilekeys_sdk_plugin/android/.gradle/buildOutputCleanup/cache.properties
index d4c30983..891315a6 100644
--- a/mobilekeys_sdk_plugin/android/.gradle/buildOutputCleanup/cache.properties
+++ b/mobilekeys_sdk_plugin/android/.gradle/buildOutputCleanup/cache.properties
@@ -1,2 +1,2 @@
-#Tue Jul 30 13:28:26 CEST 2024
-gradle.version=7.5
+#Wed Jul 31 11:34:30 CEST 2024
+gradle.version=7.3
diff --git a/mobilekeys_sdk_plugin/android/build.gradle b/mobilekeys_sdk_plugin/android/build.gradle
index 616c90cb..1ef62d0a 100644
--- a/mobilekeys_sdk_plugin/android/build.gradle
+++ b/mobilekeys_sdk_plugin/android/build.gradle
@@ -5,6 +5,9 @@ allprojects {
repositories {
google()
mavenCentral()
+ flatDir {
+ dirs 'libs'
+ }
}
}
@@ -34,7 +37,7 @@ android {
}
dependencies {
- //compileOnly fileTree(dir: 'libs', include: ['mobilekeys-android-sdk-release-*.aar'])
+ compileOnly fileTree(dir: 'libs', include: ['mobilekeys-android-sdk-release-*.aar'])
compileOnly fileTree(dir: 'libs', include: ['mobilekeys-android-sdk-debug-*.aar'])
// Mobile Keys SDK transitive dependencies
diff --git a/mobilekeys_sdk_plugin/android/gradle/wrapper/gradle-wrapper.properties b/mobilekeys_sdk_plugin/android/gradle/wrapper/gradle-wrapper.properties
index fe1a99c2..ac2064c9 100644
--- a/mobilekeys_sdk_plugin/android/gradle/wrapper/gradle-wrapper.properties
+++ b/mobilekeys_sdk_plugin/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME