Skip to content

armgit / core

Public Imported from GitHub
0

100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps

Added config for Gitlab to include FCM config file. Added config for jks for generic app for Android version. Removed symbol files for iOS libs to prevent warnings from Apple.

Michael Rademaker99246689e4cc
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1fce75593..25cc812f8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -216,6 +216,7 @@ deploy demo on OVH:
DEPLOYMENT_HOST: ${PROJECT_NAME}.openremote.io
SETUP_WIPE_CLEAN_INSTALL: 'true'
DOCKER_IMAGE_TAG: latest
+ FIREBASE_CONFIG_FILE: ${FIREBASE_CONFIG_FILE}
environment:
name: demo
url: https://${PROJECT_NAME}.openremote.io
diff --git a/console/generic_app/android/app/build.gradle b/console/generic_app/android/app/build.gradle
index 3e2952cda..27e76355b 100644
--- a/console/generic_app/android/app/build.gradle
+++ b/console/generic_app/android/app/build.gradle
@@ -26,6 +26,12 @@ apply plugin: 'kotlin-android'
apply plugin: 'com.google.gms.google-services'
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
@@ -46,11 +52,17 @@ android {
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
+ 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.
- // Signing with the debug keys for now, so `flutter run --release` works.
- signingConfig signingConfigs.debug
+ signingConfig signingConfigs.release
}
}
}
diff --git a/console/generic_app/android/key.properties b/console/generic_app/android/key.properties
new file mode 100644
index 000000000..4001f7874
--- /dev/null
+++ b/console/generic_app/android/key.properties
@@ -0,0 +1,4 @@
+storePassword=password
+keyPassword=password
+keyAlias=fill_in_alias
+storeFile=path_of_jks
diff --git a/console/generic_app/ios/Podfile b/console/generic_app/ios/Podfile
index 9a27b4897..e7ea559bc 100644
--- a/console/generic_app/ios/Podfile
+++ b/console/generic_app/ios/Podfile
@@ -82,6 +82,7 @@ post_install do |installer|
installer.pods_project.targets.each do |target|
target.build_configurations.each do |config|
config.build_settings['ENABLE_BITCODE'] = 'NO'
+ config.build_settings['DEBUG_INFORMATION_FORMAT'] = 'dwarf'
end
end
end
diff --git a/console/generic_app/ios/Podfile.lock b/console/generic_app/ios/Podfile.lock
index 3ebbb500c..4b645378c 100644
--- a/console/generic_app/ios/Podfile.lock
+++ b/console/generic_app/ios/Podfile.lock
@@ -193,6 +193,6 @@ SPEC CHECKSUMS:
shared_preferences_web: 141cce0c3ed1a1c5bf2a0e44f52d31eeb66e5ea9
webview_flutter: d2b4d6c66968ad042ad94cbb791f5b72b4678a96
-PODFILE CHECKSUM: 4923279f5a690dada6ed755b078b8c49ecbeedda
+PODFILE CHECKSUM: b719112225baeacc281d00c2f06c118c38b6b580
COCOAPODS: 1.9.1
diff --git a/console/generic_app/ios/Runner.xcodeproj/project.pbxproj b/console/generic_app/ios/Runner.xcodeproj/project.pbxproj
index 308193c6f..d889a994f 100644
--- a/console/generic_app/ios/Runner.xcodeproj/project.pbxproj
+++ b/console/generic_app/ios/Runner.xcodeproj/project.pbxproj
@@ -390,7 +390,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
- CURRENT_PROJECT_VERSION = 12;
+ CURRENT_PROJECT_VERSION = 13;
DEVELOPMENT_TEAM = 4AC88KZHJZ;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
@@ -407,6 +407,7 @@
PRODUCT_NAME = OpenRemote;
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
SWIFT_VERSION = 5.0;
+ TARGETED_DEVICE_FAMILY = 1;
VERSIONING_SYSTEM = "apple-generic";
};
name = Profile;
@@ -526,7 +527,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
- CURRENT_PROJECT_VERSION = 12;
+ CURRENT_PROJECT_VERSION = 13;
DEVELOPMENT_TEAM = 4AC88KZHJZ;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
@@ -544,6 +545,7 @@
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 5.0;
+ TARGETED_DEVICE_FAMILY = 1;
VERSIONING_SYSTEM = "apple-generic";
};
name = Debug;
@@ -555,7 +557,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
- CURRENT_PROJECT_VERSION = 12;
+ CURRENT_PROJECT_VERSION = 13;
DEVELOPMENT_TEAM = 4AC88KZHJZ;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
@@ -572,6 +574,7 @@
PRODUCT_NAME = OpenRemote;
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
SWIFT_VERSION = 5.0;
+ TARGETED_DEVICE_FAMILY = 1;
VERSIONING_SYSTEM = "apple-generic";
};
name = Release;
diff --git a/deployment/manager/openremoteapp-a6a60-firebase-adminsdk-c40fr-41938f4c85.json b/deployment/manager/openremoteapp-a6a60-firebase-adminsdk-c40fr-41938f4c85.json
deleted file mode 100644
index 62720f617..000000000
--- a/deployment/manager/openremoteapp-a6a60-firebase-adminsdk-c40fr-41938f4c85.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "type": "service_account",
- "project_id": "openremoteapp-a6a60",
- "private_key_id": "41938f4c85f68eab00cba008a2ff419209099f9e",
- "private_key": "-----BEGIN PRIVATE KEY-----\nMIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDWR4K2iS/J05y6\n8lZElNZYzOhsjuJ5evjg/htiPJeiuE4KcLE8dksI716H6cdfT118BOLdMldbRDAN\nqJ9/L2bKJX8BN0VqoZU2v3fQjt1iCn+2qhycswdM5KT2YafZkV3ICQHAQpPVWslU\nB/0lRWRpZx3jWl6Ap1sULZmRLrHUrwmjGIJZ2xyn157e4i+YT/Y7MNwdPquYCKFD\nnRdUdcboDUyNOeAWwLykK4VBd8gek5aVP0x29KoWZUbN0EUF12UItuWXGpCIj+f5\noXLAoEp+pGLvEc7a+Do2krvOxA9nJr1Ao6hfgPeMYNKgTPoTjk482UJSwFeRXZ+f\n8/JESesdAgMBAAECggEAEhMGG4+G0GdhGQPH8xD645KlKEMFJ2oQBCpq9OZXhAo3\nyvmmeYsg2SgXuS8m+gsfv45J9I6Cf9hIlV5b1caRzQtMozWeTVhD1dJgsN7cHaD1\nFNtUfoM7YmkG4SFrnxZ76puX4je7cIuv376sw7AOwDVKeBrvTbrQG+ucwHpH1cCm\nbPVWQSD0WVzF2QOIDcKenhzUghxsWPB4oTBaZZvhMkYrtrAuhgo6XIIQZZMGpGqr\nliYybOFB7NkpPKEORCx3NoEA0T109VxyajgDUq7WqYNEZP6Gt9jpjb/WIOrDKmgh\ngjZ2ig7Rod1CzOO0ZiAR/bEyxsZl4hj2dZGXSzZwoQKBgQDzXmncTnNYUhd+VDej\nOOYspWJcSVCKNi5ANqiYj66S3yaB/LHsLXbxR7erWzm4ysVo1YnZytejPlDxk5yK\nSmBkIcpmhMmruEFBAuN4Uoy1sFDVcpgTqvWqRycPRki+erW0AO9fCujsxfB3b4uP\n2gFTMiACn9+3ck4fiHK0mNfeywKBgQDhZpeHvIe+q6Y68rTfTMP7Mf0O4ZhAQQci\nXO7Fn89oumO8Quu9iI8OGwsmPAji5VegMEBZtTRsEnjSLj2ZJapX06YjFtd16RBs\nHqQonWXD1yDk6CYzqwaSly68bcQccmbaFvP5SH2ROhRDAoPbIr6ehq+YPn47su8+\nNv48tM/4twKBgQCMlYONcfwLjxBnN3sUXLAKJldVfDx8OqQpD+oAhy+PRDzYZgLZ\nrcHBy238HKyRZQD4eDIzj4tVj4/unRiWgjSAY0yqQBbHjZ6UUXjZbsY9xmZLhvD2\nm5FiFcwodK9c6UHBg7DDNGgtLoKkW9lA9exCBPicy4HOVMdwS8AHNyusVQKBgDCJ\nBtgToKdODt1ipc/vl8PfX750lXRAjGi52jBz2RWUDSXcwyZs4WEIMb5p7v/sopG7\n0h9/BWrAD4QysNDpa2S+Dmg/4uVg6khd0LtuKRuil1KzKoa1rRSjuUyZ1kDJ4ZvU\nlXR4R5GeD/7d68akFKfOGMGPs17niNy8usIXrTDBAoGAMvcRwF+jGyEJyQnS7wmX\n7WPBYcdTGAbiqm+G9TfBQOPeTppGhHcLlHu8SMS3zCROor1eoK/GjmXqP5tHCQpx\n48TK16uCP8WqfXsjMaAJLZzvCVYLGCXqeW9SphpFiG+/6A9DerJ+hOlFWY72tL7u\nSPXl36aO+kVXYk5ngpfxLOk=\n-----END PRIVATE KEY-----\n",
- "client_email": "firebase-adminsdk-c40fr@openremoteapp-a6a60.iam.gserviceaccount.com",
- "client_id": "116224360723880183433",
- "auth_uri": "https://accounts.google.com/o/oauth2/auth",
- "token_uri": "https://oauth2.googleapis.com/token",
- "auth_provider_x509_cert_url": "https://www.googleapis.com/oauth2/v1/certs",
- "client_x509_cert_url": "https://www.googleapis.com/robot/v1/metadata/x509/firebase-adminsdk-c40fr%40openremoteapp-a6a60.iam.gserviceaccount.com"
-}
diff --git a/profile/demo-openremote.yml b/profile/demo-openremote.yml
index 939f5254a..b38f35bfb 100644
--- a/profile/demo-openremote.yml
+++ b/profile/demo-openremote.yml
@@ -90,7 +90,7 @@ services:
environment:
MAP_TILES_PATH: '/deployment.local/map/mapdata.mbtiles'
IDENTITY_NETWORK_HOST: demo.openremote.io
- FIREBASE_CONFIG_FILE: '/deployment/manager/openremoteapp-a6a60-firebase-adminsdk-c40fr-41938f4c85.json'
+ FIREBASE_CONFIG_FILE: ${FIREBASE_CONFIG_FILE}
keycloak:
extends: