ETM-Schurig/powersync-app
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge PR #599: Add overlay support to iOS build

Browse Source
This commit is contained in:
Jenkins nymea 2021-05-29 17:13:32 +02:00
commit ebe300b64b
3 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
config.pri
View File

@ -3,3 +3,6 @@ ORGANISATION_NAME="nymea"
PACKAGE_URN=io.nymea.nymeaapp PACKAGE_URN=io.nymea.nymeaapp
PACKAGE_NAME=nymea-app PACKAGE_NAME=nymea-app
IOS_BUNDLE_PREFIX=io.guh
IOS_BUNDLE_NAME=nymeaApp

25
nymea-app/nymea-app.pro
View File

@ -111,12 +111,12 @@ ios: {
QT += webview QT += webview
HEADERS += platformintegration/ios/platformhelperios.h HEADERS += platformintegration/ios/platformhelperios.h
SOURCES += platformintegration/ios/platformhelperios.cpp SOURCES += platformintegration/ios/platformhelperios.cpp
OBJECTIVE_SOURCES += $$PWD/../packaging/ios/platformhelperios.mm \ OBJECTIVE_SOURCES += $${IOS_PACKAGE_DIR}/platformhelperios.mm \
$$PWD/../packaging/ios/pushnotifications.mm \ $${IOS_PACKAGE_DIR}/pushnotifications.mm \
# Add Firebase SDK # Add Firebase SDK
QMAKE_LFLAGS += -ObjC $(inherited) QMAKE_LFLAGS += -ObjC $(inherited)
firebase_files.files += $$files(../packaging/ios/GoogleService-Info.plist) firebase_files.files += $$files($${IOS_PACKAGE_DIR}/GoogleService-Info.plist)
QMAKE_BUNDLE_DATA += firebase_files QMAKE_BUNDLE_DATA += firebase_files
INCLUDEPATH += ../3rdParty/ios/ INCLUDEPATH += ../3rdParty/ios/
LIBS += -F$$PWD/../3rdParty/ios/Firebase/FirebaseAnalytics/ \ LIBS += -F$$PWD/../3rdParty/ios/Firebase/FirebaseAnalytics/ \
@ -130,21 +130,20 @@ ios: {
-framework "PromisesObjC" \ -framework "PromisesObjC" \
QMAKE_TARGET_BUNDLE_PREFIX = io.guh
QMAKE_BUNDLE = nymeaApp
# Configure generated xcode project to have our bundle id # Configure generated xcode project to have our bundle id
xcode_product_bundle_identifier_setting.value = $${QMAKE_TARGET_BUNDLE_PREFIX}.$${QMAKE_BUNDLE} QMAKE_TARGET_BUNDLE_PREFIX=$${IOS_BUNDLE_PREFIX}
plist.input = ../packaging/ios/Info.plist.in QMAKE_BUNDLE=$${IOS_BUNDLE_NAME}
plist.input = $${IOS_PACKAGE_DIR}/Info.plist.in
plist.output = $$OUT_PWD/Info.plist plist.output = $$OUT_PWD/Info.plist
QMAKE_SUBSTITUTES += plist QMAKE_SUBSTITUTES += plist
QMAKE_INFO_PLIST = $$OUT_PWD/Info.plist QMAKE_INFO_PLIST = $$OUT_PWD/Info.plist
OTHER_FILES += ../packaging/ios/Info.plist.in \ OTHER_FILES += $${IOS_PACKAGE_DIR}/Info.plist.in \
../packaging/ios/pushnotifications.entitlements \ $${IOS_PACKAGE_DIR}/pushnotifications.entitlements \
../packaging/ios/GoogleService-Info.plist $${IOS_PACKAGE_DIR}/GoogleService-Info.plist
QMAKE_ASSET_CATALOGS += ../packaging/ios/Assets.xcassets QMAKE_ASSET_CATALOGS += $${IOS_PACKAGE_DIR}/Assets.xcassets
ios_launch_images.files += ../packaging/ios/NymeaLaunchScreen.storyboard ios_launch_images.files += $${IOS_PACKAGE_DIR}/NymeaLaunchScreen.storyboard
QMAKE_BUNDLE_DATA += ios_launch_images QMAKE_BUNDLE_DATA += ios_launch_images
IOS_DEVELOPMENT_TEAM.name = DEVELOPMENT_TEAM IOS_DEVELOPMENT_TEAM.name = DEVELOPMENT_TEAM
@ -152,7 +151,7 @@ ios: {
QMAKE_MAC_XCODE_SETTINGS += IOS_DEVELOPMENT_TEAM QMAKE_MAC_XCODE_SETTINGS += IOS_DEVELOPMENT_TEAM
IOS_ENTITLEMENTS.name = CODE_SIGN_ENTITLEMENTS IOS_ENTITLEMENTS.name = CODE_SIGN_ENTITLEMENTS
IOS_ENTITLEMENTS.value = $$files($$PWD/../packaging/ios/pushnotifications.entitlements) IOS_ENTITLEMENTS.value = $$files($${IOS_PACKAGE_DIR}/pushnotifications.entitlements)
QMAKE_MAC_XCODE_SETTINGS += IOS_ENTITLEMENTS QMAKE_MAC_XCODE_SETTINGS += IOS_ENTITLEMENTS
} }

1
shared.pri
View File

@ -43,6 +43,7 @@ android: {
ios: { ios: {
!no-firebase:DEFINES+=WITH_FIREBASE !no-firebase:DEFINES+=WITH_FIREBASE
IOS_PACKAGE_DIR = $${PACKAGE_BASE_DIR}/ios/
} }
macx: { macx: {