commit 486e505681dedfbc314783b1ad4b55d11f313483
parent b8bfbe454e8cf21358b50d841a45cb2f162a851f
Author: triesap <137732411+triesap@users.noreply.github.com>
Date: Wed, 28 Aug 2024 08:09:35 +0000
Build app
Diffstat:
9 files changed, 31 insertions(+), 51 deletions(-)
diff --git a/android/app/capacitor.build.gradle b/android/app/capacitor.build.gradle
@@ -11,8 +11,10 @@ apply from: "../capacitor-cordova-android-plugins/cordova.variables.gradle"
dependencies {
implementation project(':capacitor-dialog')
implementation project(':capacitor-geolocation')
+ implementation project(':capacitor-haptics')
implementation project(':capacitor-preferences')
implementation project(':capacitor-splash-screen')
+ implementation project(':capacitor-share')
implementation project(':radroots-capacitor-sqlite')
implementation project(':radroots-capacitor-secure-storage')
diff --git a/android/capacitor.settings.gradle b/android/capacitor.settings.gradle
@@ -8,12 +8,18 @@ project(':capacitor-dialog').projectDir = new File('../../../node_modules/.pnpm/
include ':capacitor-geolocation'
project(':capacitor-geolocation').projectDir = new File('../../../node_modules/.pnpm/@capacitor+geolocation@6.0.1_@capacitor+core@6.1.2/node_modules/@capacitor/geolocation/android')
+include ':capacitor-haptics'
+project(':capacitor-haptics').projectDir = new File('../../../node_modules/.pnpm/@capacitor+haptics@6.0.1_@capacitor+core@6.1.2/node_modules/@capacitor/haptics/android')
+
include ':capacitor-preferences'
project(':capacitor-preferences').projectDir = new File('../../../node_modules/.pnpm/@capacitor+preferences@6.0.2_@capacitor+core@6.1.2/node_modules/@capacitor/preferences/android')
include ':capacitor-splash-screen'
project(':capacitor-splash-screen').projectDir = new File('../../../node_modules/.pnpm/@capacitor+splash-screen@6.0.2_@capacitor+core@6.1.2/node_modules/@capacitor/splash-screen/android')
+include ':capacitor-share'
+project(':capacitor-share').projectDir = new File('../../../node_modules/.pnpm/@capacitor+share@6.0.2_@capacitor+core@6.1.2/node_modules/@capacitor/share/android')
+
include ':radroots-capacitor-sqlite'
project(':radroots-capacitor-sqlite').projectDir = new File('../../../packages/capacitor-sqlite/android')
diff --git a/capacitor.config.ts b/capacitor.config.ts
@@ -4,6 +4,8 @@ const dev = process.env.NODE_ENV === `dev`;
const port = process.env.RADROOTS_APP_PORT ? Number(process.env.RADROOTS_APP_PORT) : 3000;
const iosKeychainPrefix = process.env.RADROOTS_APP_SQLITE_KEYCHAIN_PREFIX;
if (!iosKeychainPrefix) throw new Error('Error: iosKeychainPrefix is required');
+const iosDatabaseLocation = process.env.RADROOTS_APP_SQLITE_DATABASE_LOCATION;
+if (!iosDatabaseLocation) throw new Error('Error: iosDatabaseLocation is required');
const config: CapacitorConfig = {
appId: process.env.RADROOTS_APP_ID,
@@ -20,7 +22,7 @@ const config: CapacitorConfig = {
launchAutoHide: false,
},
CapacitorSQLite: {
- iosDatabaseLocation: 'Library/radroots',
+ iosDatabaseLocation,
iosIsEncryption: true,
iosKeychainPrefix,
androidIsEncryption: true,
diff --git a/ios/App/App.xcodeproj/project.pbxproj b/ios/App/App.xcodeproj/project.pbxproj
@@ -15,7 +15,6 @@
504EC3121FED79650016851F /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 504EC3101FED79650016851F /* LaunchScreen.storyboard */; };
50B271D11FEDC1A000F3C39B /* public in Resources */ = {isa = PBXBuildFile; fileRef = 50B271D01FEDC1A000F3C39B /* public */; };
A084ECDBA7D38E1E42DFC39D /* Pods_App.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AF277DCFFFF123FFC6DF26C7 /* Pods_App.framework */; };
- C10403EA2C7E724D00A34E6D /* InfoPlist.xcstrings in Resources */ = {isa = PBXBuildFile; fileRef = C10403E92C7E724D00A34E6D /* InfoPlist.xcstrings */; };
/* End PBXBuildFile section */
/* Begin PBXFileReference section */
@@ -30,7 +29,6 @@
50B271D01FEDC1A000F3C39B /* public */ = {isa = PBXFileReference; lastKnownFileType = folder; path = public; sourceTree = "<group>"; };
AF277DCFFFF123FFC6DF26C7 /* Pods_App.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_App.framework; sourceTree = BUILT_PRODUCTS_DIR; };
AF51FD2D460BCFE21FA515B2 /* Pods-App.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-App.release.xcconfig"; path = "Pods/Target Support Files/Pods-App/Pods-App.release.xcconfig"; sourceTree = "<group>"; };
- C10403E92C7E724D00A34E6D /* InfoPlist.xcstrings */ = {isa = PBXFileReference; lastKnownFileType = text.json.xcstrings; path = InfoPlist.xcstrings; sourceTree = "<group>"; };
FC68EB0AF532CFC21C3344DD /* Pods-App.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-App.debug.xcconfig"; path = "Pods/Target Support Files/Pods-App/Pods-App.debug.xcconfig"; sourceTree = "<group>"; };
/* End PBXFileReference section */
@@ -57,7 +55,6 @@
504EC2FB1FED79650016851F = {
isa = PBXGroup;
children = (
- C10403E92C7E724D00A34E6D /* InfoPlist.xcstrings */,
504EC3061FED79650016851F /* App */,
504EC3051FED79650016851F /* Products */,
7F8756D8B27F46E3366F6CEA /* Pods */,
@@ -165,7 +162,6 @@
504EC30F1FED79650016851F /* Assets.xcassets in Resources */,
50379B232058CBB4000EE86E /* capacitor.config.json in Resources */,
504EC30D1FED79650016851F /* Main.storyboard in Resources */,
- C10403EA2C7E724D00A34E6D /* InfoPlist.xcstrings in Resources */,
2FAD9763203C412B000D30F8 /* config.xml in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
@@ -352,7 +348,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_STYLE = Automatic;
- CURRENT_PROJECT_VERSION = 3;
+ CURRENT_PROJECT_VERSION = 11;
DEVELOPMENT_TEAM = AR84X5Z9HU;
INFOPLIST_FILE = App/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = Radroots;
@@ -374,7 +370,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_STYLE = Automatic;
- CURRENT_PROJECT_VERSION = 3;
+ CURRENT_PROJECT_VERSION = 11;
DEVELOPMENT_TEAM = AR84X5Z9HU;
INFOPLIST_FILE = App/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = Radroots;
diff --git a/ios/App/App/Info.plist b/ios/App/App/Info.plist
@@ -3,7 +3,7 @@
<plist version="1.0">
<dict>
<key>NSLocationWhenInUseUsageDescription</key>
- <string>$(NSLocationWhenInUseUsageDescription)</string>
+ <string>Uses device GPS to read current location.</string>
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleDisplayName</key>
diff --git a/ios/App/InfoPlist.xcstrings b/ios/App/InfoPlist.xcstrings
@@ -1,41 +0,0 @@
-{
- "sourceLanguage" : "en",
- "strings" : {
- "CFBundleDisplayName" : {
- "comment" : "Bundle display name",
- "extractionState" : "extracted_with_value",
- "localizations" : {
- "en" : {
- "stringUnit" : {
- "state" : "new",
- "value" : "Radroots"
- }
- }
- }
- },
- "CFBundleName" : {
- "comment" : "Bundle name",
- "extractionState" : "extracted_with_value",
- "localizations" : {
- "en" : {
- "stringUnit" : {
- "state" : "new",
- "value" : "App"
- }
- }
- }
- },
- "NSLocationWhenInUseUsageDescription" : {
- "extractionState" : "manual",
- "localizations" : {
- "en" : {
- "stringUnit" : {
- "state" : "translated",
- "value" : "Uses device GPS to read current location."
- }
- }
- }
- }
- },
- "version" : "1.0"
-}
-\ No newline at end of file
diff --git a/ios/App/Podfile b/ios/App/Podfile
@@ -13,8 +13,10 @@ def capacitor_pods
pod 'CapacitorCordova', :path => '../../../../node_modules/.pnpm/@capacitor+ios@6.1.2_@capacitor+core@6.1.2/node_modules/@capacitor/ios'
pod 'CapacitorDialog', :path => '../../../../node_modules/.pnpm/@capacitor+dialog@6.0.1_@capacitor+core@6.1.2/node_modules/@capacitor/dialog'
pod 'CapacitorGeolocation', :path => '../../../../node_modules/.pnpm/@capacitor+geolocation@6.0.1_@capacitor+core@6.1.2/node_modules/@capacitor/geolocation'
+ pod 'CapacitorHaptics', :path => '../../../../node_modules/.pnpm/@capacitor+haptics@6.0.1_@capacitor+core@6.1.2/node_modules/@capacitor/haptics'
pod 'CapacitorPreferences', :path => '../../../../node_modules/.pnpm/@capacitor+preferences@6.0.2_@capacitor+core@6.1.2/node_modules/@capacitor/preferences'
pod 'CapacitorSplashScreen', :path => '../../../../node_modules/.pnpm/@capacitor+splash-screen@6.0.2_@capacitor+core@6.1.2/node_modules/@capacitor/splash-screen'
+ pod 'CapacitorShare', :path => '../../../../node_modules/.pnpm/@capacitor+share@6.0.2_@capacitor+core@6.1.2/node_modules/@capacitor/share'
pod 'RadrootsCapacitorSqlite', :path => '../../../../packages/capacitor-sqlite'
pod 'RadrootsCapacitorSecureStorage', :path => '../../../../packages/capacitor-secure-storage'
end
diff --git a/ios/App/Podfile.lock b/ios/App/Podfile.lock
@@ -6,8 +6,12 @@ PODS:
- Capacitor
- CapacitorGeolocation (6.0.1):
- Capacitor
+ - CapacitorHaptics (6.0.1):
+ - Capacitor
- CapacitorPreferences (6.0.2):
- Capacitor
+ - CapacitorShare (6.0.2):
+ - Capacitor
- CapacitorSplashScreen (6.0.2):
- Capacitor
- KeychainSwift (21.0.0)
@@ -30,7 +34,9 @@ DEPENDENCIES:
- "CapacitorCordova (from `../../../../node_modules/.pnpm/@capacitor+ios@6.1.2_@capacitor+core@6.1.2/node_modules/@capacitor/ios`)"
- "CapacitorDialog (from `../../../../node_modules/.pnpm/@capacitor+dialog@6.0.1_@capacitor+core@6.1.2/node_modules/@capacitor/dialog`)"
- "CapacitorGeolocation (from `../../../../node_modules/.pnpm/@capacitor+geolocation@6.0.1_@capacitor+core@6.1.2/node_modules/@capacitor/geolocation`)"
+ - "CapacitorHaptics (from `../../../../node_modules/.pnpm/@capacitor+haptics@6.0.1_@capacitor+core@6.1.2/node_modules/@capacitor/haptics`)"
- "CapacitorPreferences (from `../../../../node_modules/.pnpm/@capacitor+preferences@6.0.2_@capacitor+core@6.1.2/node_modules/@capacitor/preferences`)"
+ - "CapacitorShare (from `../../../../node_modules/.pnpm/@capacitor+share@6.0.2_@capacitor+core@6.1.2/node_modules/@capacitor/share`)"
- "CapacitorSplashScreen (from `../../../../node_modules/.pnpm/@capacitor+splash-screen@6.0.2_@capacitor+core@6.1.2/node_modules/@capacitor/splash-screen`)"
- RadrootsCapacitorSecureStorage (from `../../../../packages/capacitor-secure-storage`)
- RadrootsCapacitorSqlite (from `../../../../packages/capacitor-sqlite`)
@@ -50,8 +56,12 @@ EXTERNAL SOURCES:
:path: "../../../../node_modules/.pnpm/@capacitor+dialog@6.0.1_@capacitor+core@6.1.2/node_modules/@capacitor/dialog"
CapacitorGeolocation:
:path: "../../../../node_modules/.pnpm/@capacitor+geolocation@6.0.1_@capacitor+core@6.1.2/node_modules/@capacitor/geolocation"
+ CapacitorHaptics:
+ :path: "../../../../node_modules/.pnpm/@capacitor+haptics@6.0.1_@capacitor+core@6.1.2/node_modules/@capacitor/haptics"
CapacitorPreferences:
:path: "../../../../node_modules/.pnpm/@capacitor+preferences@6.0.2_@capacitor+core@6.1.2/node_modules/@capacitor/preferences"
+ CapacitorShare:
+ :path: "../../../../node_modules/.pnpm/@capacitor+share@6.0.2_@capacitor+core@6.1.2/node_modules/@capacitor/share"
CapacitorSplashScreen:
:path: "../../../../node_modules/.pnpm/@capacitor+splash-screen@6.0.2_@capacitor+core@6.1.2/node_modules/@capacitor/splash-screen"
RadrootsCapacitorSecureStorage:
@@ -64,7 +74,9 @@ SPEC CHECKSUMS:
CapacitorCordova: f48c89f96c319101cd2f0ce8a2b7449b5fb8b3dd
CapacitorDialog: ad752191fdb22a8d0ac199b0754b8a021d86dbf9
CapacitorGeolocation: 39dca51d755f08ed1d43e51be55291a402cdc64f
+ CapacitorHaptics: fe689ade56ef20ec9b041a753c6da70c5d8ec9a9
CapacitorPreferences: e8284bf740cf8c6d3f25409af3c01df87dfeb5a1
+ CapacitorShare: 591ae4693d85686ceb590db8e8b44aa014ec6490
CapacitorSplashScreen: 250df9ef8014fac5c7c1fd231f0f8b1d8f0b5624
KeychainSwift: 4a71a45c802fd9e73906457c2dcbdbdc06c9419d
RadrootsCapacitorSecureStorage: d95a1648c105ddf18a1b0612528e0ce1f77b789e
@@ -72,6 +84,6 @@ SPEC CHECKSUMS:
SQLCipher: 77fbe633cd84db04b07876dd50766b4924b57d61
ZIPFoundation: b8c29ea7ae353b309bc810586181fd073cb3312c
-PODFILE CHECKSUM: adef25b71a81718ce98042fd56c02057b582e57f
+PODFILE CHECKSUM: a829fb2b902c48695cd16120dd26106d2580cd4f
COCOAPODS: 1.15.2
diff --git a/package.json b/package.json
@@ -38,8 +38,10 @@
"@capacitor/core": "^6.1.2",
"@capacitor/dialog": "^6.0.0",
"@capacitor/geolocation": "^6.0.0",
+ "@capacitor/haptics": "^6.0.0",
"@capacitor/preferences": "^6.0.0",
"@capacitor/splash-screen": "^6.0.0",
+ "@capacitor/share": "^6.0.0",
"@capacitor/ios": "^6.0.0",
"@ionic/pwa-elements": "^3.3.0",
"@radroots/capacitor-sqlite": "workspace:*",
