From 2b633d12e277fd4cb3a2dd7bd9872fdfa5978946 Mon Sep 17 00:00:00 2001 From: Timo Dittmann Date: Mon, 9 Sep 2024 19:58:02 +0200 Subject: [PATCH] [6.6.1] Fixed Push Notifications for Android because of missing google-services.json --- android/app/build.gradle | 4 +-- config.xml | 2 +- ios/App/App.xcodeproj/project.pbxproj | 19 +++++++++- ios/App/Podfile | 2 +- ios/App/Podfile.lock | 36 +++++++++---------- package.json | 2 +- .../pages/imprint/imprint.page.ts | 2 +- 7 files changed, 42 insertions(+), 25 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 4bc93f34..986330f4 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -7,8 +7,8 @@ android { applicationId "de.timodittmann.scd" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 660000 - versionName "6.6.0" + versionCode 661000 + versionName "6.6.1" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" aaptOptions { // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps. diff --git a/config.xml b/config.xml index aeab3a5d..49472311 100644 --- a/config.xml +++ b/config.xml @@ -1,5 +1,5 @@ - + SC Dahenfeld An awesome SC Dahenfeld app. Timo Dittmann diff --git a/ios/App/App.xcodeproj/project.pbxproj b/ios/App/App.xcodeproj/project.pbxproj index 6ee9fb64..a2ffc31e 100644 --- a/ios/App/App.xcodeproj/project.pbxproj +++ b/ios/App/App.xcodeproj/project.pbxproj @@ -193,13 +193,30 @@ files = ( ); inputPaths = ( + "${SRCROOT}/Pods/Target Support Files/Pods-App/Pods-App-frameworks.sh", + "${BUILT_PRODUCTS_DIR}/Capacitor/Capacitor.framework", + "${BUILT_PRODUCTS_DIR}/CapacitorApp/CapacitorApp.framework", + "${BUILT_PRODUCTS_DIR}/CapacitorBrowser/CapacitorBrowser.framework", + "${BUILT_PRODUCTS_DIR}/CapacitorCordova/Cordova.framework", + "${BUILT_PRODUCTS_DIR}/CapacitorDevice/CapacitorDevice.framework", + "${BUILT_PRODUCTS_DIR}/CapacitorPushNotifications/CapacitorPushNotifications.framework", + "${BUILT_PRODUCTS_DIR}/CapacitorSplashScreen/CapacitorSplashScreen.framework", + "${BUILT_PRODUCTS_DIR}/CapacitorStatusBar/CapacitorStatusBar.framework", ); name = "[CP] Embed Pods Frameworks"; outputPaths = ( + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Capacitor.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CapacitorApp.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CapacitorBrowser.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Cordova.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CapacitorDevice.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CapacitorPushNotifications.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CapacitorSplashScreen.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CapacitorStatusBar.framework", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-App/Pods-App-frameworks.sh\"\n"; + shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-App/Pods-App-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; /* End PBXShellScriptBuildPhase section */ diff --git a/ios/App/Podfile b/ios/App/Podfile index bbacd134..f3f855f4 100644 --- a/ios/App/Podfile +++ b/ios/App/Podfile @@ -6,7 +6,7 @@ use_frameworks! # workaround to avoid Xcode caching of Pods that requires # Product -> Clean Build Folder after new Cordova plugins installed # Requires CocoaPods 1.6 or newer -install! 'cocoapods', :disable_input_output_paths => true +install! 'cocoapods' def capacitor_pods pod 'Capacitor', :path => '../../node_modules/@capacitor/ios' diff --git a/ios/App/Podfile.lock b/ios/App/Podfile.lock index ab714fa4..ad407eab 100644 --- a/ios/App/Podfile.lock +++ b/ios/App/Podfile.lock @@ -1,18 +1,18 @@ PODS: - - Capacitor (5.6.0): + - Capacitor (6.1.2): - CapacitorCordova - - CapacitorApp (5.0.6): + - CapacitorApp (6.0.1): - Capacitor - - CapacitorBrowser (5.1.0): + - CapacitorBrowser (6.0.2): - Capacitor - - CapacitorCordova (5.6.0) - - CapacitorDevice (5.0.6): + - CapacitorCordova (6.1.2) + - CapacitorDevice (6.0.1): - Capacitor - - CapacitorPushNotifications (5.1.0): + - CapacitorPushNotifications (6.0.2): - Capacitor - - CapacitorSplashScreen (5.0.6): + - CapacitorSplashScreen (6.0.2): - Capacitor - - CapacitorStatusBar (5.0.6): + - CapacitorStatusBar (6.0.1): - Capacitor DEPENDENCIES: @@ -44,15 +44,15 @@ EXTERNAL SOURCES: :path: "../../node_modules/@capacitor/status-bar" SPEC CHECKSUMS: - Capacitor: ebfc16cdb8116d04c101686b080342872da42d43 - CapacitorApp: 024e1b1bea5f883d79f6330d309bc441c88ad04a - CapacitorBrowser: 7a0fb6a1011abfaaf2dfedfd8248f942a8eda3d6 - CapacitorCordova: 931b48fcdbc9bc985fc2f16cec9f77c794a27729 - CapacitorDevice: 2c968f98a1ec4d22357418c1521e7ddc46c675e6 - CapacitorPushNotifications: b31e326c6e4eb216a622041d6ca21a973f34943f - CapacitorSplashScreen: 5fa2ab5e46cf5cc530cf16a51c80c7a986579ccd - CapacitorStatusBar: 565c0a1ebd79bb40d797606a8992b4a105885309 + Capacitor: 48e69f3d54640fb30dc99a8e711bb645b11c0283 + CapacitorApp: 5d3b9275003a1bb33ee5310fb398b82c9ebc7ca5 + CapacitorBrowser: 5cb440b06536074e8b1e4ad64bdd811d504bbab3 + CapacitorCordova: bab53e0b5106da1b6293a750a68df9c477461b91 + CapacitorDevice: ee4f3c1e73a17ba41b9d0c1155aacb676a9699cd + CapacitorPushNotifications: 5ad946184f898b11629bb18f178e99e6b219e2cd + CapacitorSplashScreen: 191954d1205535e587cff7d522e7eb5e89e9208a + CapacitorStatusBar: b34cc9c61d1fdd5b2712d533e4b60ca4c14e31b8 -PODFILE CHECKSUM: 29cceb50aca61af26a55e390dd683226bc25cff4 +PODFILE CHECKSUM: 3fd2b2802191fe3bd70869fd3a3a73dbe046393c -COCOAPODS: 1.11.2 +COCOAPODS: 1.5.2 diff --git a/package.json b/package.json index 9ed3a58a..0cfd54b0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "sc-dahenfeld", - "version": "6.6.0", + "version": "6.6.1", "author": "Timo Dittmann", "homepage": "http://timo-dittmann.de/", "scripts": { diff --git a/src/app/presentation/pages/imprint/imprint.page.ts b/src/app/presentation/pages/imprint/imprint.page.ts index 3eefb186..c8dcf017 100644 --- a/src/app/presentation/pages/imprint/imprint.page.ts +++ b/src/app/presentation/pages/imprint/imprint.page.ts @@ -13,7 +13,7 @@ import { App } from '@capacitor/app'; }) export class ImprintPage implements OnInit { heading: string; - version = '6.6.0'; + version = '6.6.1'; developer = 'Timo Dittmann'; darkMode = false;