Merge branch 'master' into dev

2022-05-02 18:28:54 +02:00 · 2022-05-02 18:28:54 +02:00 · 929e3a9c7f
commit 929e3a9c7f
parent 7d93a2ceef 219bdba215
5 changed files with 1 additions and 1 deletions
--- a/app/build.gradle
+++ b/app/build.gradle
@ -109,7 +109,7 @@ android {
    defaultConfig {
        multiDexEnabled true
        versionCode 1500
-        version "3.0.0.1-dev-i"
+        version "3.0.0.2-dev-i"
        buildConfigField "String", "VERSION", '"' + version + '"'
        buildConfigField "String", "BUILDVERSION", '"' + generateGitBuild() + '-' + generateDate() + '"'
        buildConfigField "String", "REMOTE", '"' + generateGitRemote() + '"'
--- a/danars/src/main/jniLibs/arm64-v8a/libBleEncryption.so
+++ b/danars/src/main/jniLibs/arm64-v8a/libBleEncryption.so
--- a/danars/src/main/jniLibs/armeabi-v7a/libBleEncryption.so
+++ b/danars/src/main/jniLibs/armeabi-v7a/libBleEncryption.so
--- a/danars/src/main/jniLibs/x86/libBleEncryption.so
+++ b/danars/src/main/jniLibs/x86/libBleEncryption.so
--- a/danars/src/main/jniLibs/x86_64/libBleEncryption.so
+++ b/danars/src/main/jniLibs/x86_64/libBleEncryption.so