diff --git a/CHANGELOG.md b/CHANGELOG.md index 36fe69fc..bbd1ceea 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +## 3.0.0 +- Changed bundleID (Apple) and applicationId (Google) to be dk.carp.studiesapp to remove depricated 'cachet'. + ## 2.0.0 - Update to latest version of Carp Mobile Sensing (1.5.0) diff --git a/android/app/build.gradle b/android/app/build.gradle index 72fc5211..15026e17 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -34,7 +34,7 @@ if (flutterVersionName == null) { } android { - namespace "dk.carp.studies_app" + namespace "dk.carp.studiesapp" compileSdkVersion 34 ndkVersion flutter.ndkVersion @@ -52,7 +52,7 @@ android { } defaultConfig { - applicationId "dk.cachet.carp_study_app" + applicationId "dk.carp.studiesapp" // You can update the following values to match your application needs. // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration. minSdkVersion 28 diff --git a/android/app/src/main/kotlin/dk/carp/studies_app/MainActivity.kt b/android/app/src/main/kotlin/dk/carp/studiesapp/MainActivity.kt similarity index 80% rename from android/app/src/main/kotlin/dk/carp/studies_app/MainActivity.kt rename to android/app/src/main/kotlin/dk/carp/studiesapp/MainActivity.kt index 1fa64363..c56acabf 100644 --- a/android/app/src/main/kotlin/dk/carp/studies_app/MainActivity.kt +++ b/android/app/src/main/kotlin/dk/carp/studiesapp/MainActivity.kt @@ -1,4 +1,4 @@ -package dk.carp.studies_app +package dk.carp.studiesapp import io.flutter.embedding.android.FlutterFragmentActivity diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index ed26b4dd..df8b3f03 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -452,7 +452,7 @@ "@executable_path/Frameworks", ); MARKETING_VERSION = "$(FLUTTER_BUILD_NUMBER)"; - PRODUCT_BUNDLE_IDENTIFIER = com.cachet.carpstudyapp; + PRODUCT_BUNDLE_IDENTIFIER = dk.carp.studiesapp; PRODUCT_NAME = "$(TARGET_NAME)"; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; SUPPORTS_MACCATALYST = NO; @@ -471,9 +471,10 @@ BUNDLE_LOADER = "$(TEST_HOST)"; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; + DEVELOPMENT_TEAM = 59TCTNUBMQ; GENERATE_INFOPLIST_FILE = YES; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.cachet.carpstudyapp.RunnerTests; + PRODUCT_BUNDLE_IDENTIFIER = dk.carp.studiesapp.RunnerTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; @@ -488,9 +489,10 @@ BUNDLE_LOADER = "$(TEST_HOST)"; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; + DEVELOPMENT_TEAM = 59TCTNUBMQ; GENERATE_INFOPLIST_FILE = YES; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.cachet.carpstudyapp.RunnerTests; + PRODUCT_BUNDLE_IDENTIFIER = dk.carp.studiesapp.RunnerTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner"; @@ -503,9 +505,10 @@ BUNDLE_LOADER = "$(TEST_HOST)"; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; + DEVELOPMENT_TEAM = 59TCTNUBMQ; GENERATE_INFOPLIST_FILE = YES; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.cachet.carpstudyapp.RunnerTests; + PRODUCT_BUNDLE_IDENTIFIER = dk.carp.studiesapp.RunnerTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner"; @@ -639,7 +642,7 @@ "@executable_path/Frameworks", ); MARKETING_VERSION = "$(FLUTTER_BUILD_NUMBER)"; - PRODUCT_BUNDLE_IDENTIFIER = com.cachet.carpstudyapp; + PRODUCT_BUNDLE_IDENTIFIER = dk.carp.studiesapp; PRODUCT_NAME = "$(TARGET_NAME)"; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; SUPPORTS_MACCATALYST = NO; @@ -673,7 +676,7 @@ "@executable_path/Frameworks", ); MARKETING_VERSION = "$(FLUTTER_BUILD_NUMBER)"; - PRODUCT_BUNDLE_IDENTIFIER = com.cachet.carpstudyapp; + PRODUCT_BUNDLE_IDENTIFIER = dk.carp.studiesapp; PRODUCT_NAME = "$(TARGET_NAME)"; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; SUPPORTS_MACCATALYST = NO; diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist index 63d800a6..88c74713 100644 --- a/ios/Runner/Info.plist +++ b/ios/Runner/Info.plist @@ -2,6 +2,10 @@ + BGTaskSchedulerPermittedIdentifiers + + $(PRODUCT_BUNDLE_IDENTIFIER) + CADisableMinimumFrameDurationOnPhone CFBundleDevelopmentRegion @@ -95,15 +99,10 @@ bluetooth-central bluetooth-peripheral - fetch location processing - BGTaskSchedulerPermittedIdentifiers - - $(PRODUCT_BUNDLE_IDENTIFIER) - UIFileSharingEnabled UILaunchStoryboardName diff --git a/pubspec.lock b/pubspec.lock index 43af5039..5fb36d21 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -186,10 +186,10 @@ packages: dependency: transitive description: name: camera_android_camerax - sha256: "8bd9cab67551642eb33ceb33ece7acc0890014fc90ddfae637c7e2b683657e65" + sha256: "7cd93578ad201dcc6bb5810451fb00d76a86bab9b68dceb68b8cbd7038ac5846" url: "https://pub.dev" source: hosted - version: "0.6.7+2" + version: "0.6.8+3" camera_avfoundation: dependency: transitive description: @@ -806,10 +806,10 @@ packages: dependency: "direct main" description: name: go_router - sha256: ddc16d34b0d74cb313986918c0f0885a7ba2fc24d8fb8419de75f0015144ccfe + sha256: "48d03a1e4887b00fe622695139246e3c778ac814eeb32421467b56d23fa64034" url: "https://pub.dev" source: hosted - version: "14.2.3" + version: "14.2.6" google_fonts: dependency: "direct main" description: @@ -1438,10 +1438,10 @@ packages: dependency: transitive description: name: permission_handler_html - sha256: d220eb8476b466d58b161e10b3001d93999010a26228a3fb89c4280db1249546 + sha256: af26edbbb1f2674af65a8f4b56e1a6f526156bc273d0e65dd8075fab51c78851 url: "https://pub.dev" source: hosted - version: "0.1.3+1" + version: "0.1.3+2" permission_handler_platform_interface: dependency: transitive description: @@ -1747,10 +1747,10 @@ packages: dependency: transitive description: name: source_map_stack_trace - sha256: "84cf769ad83aa6bb61e0aa5a18e53aea683395f196a6f39c4c881fb90ed4f7ae" + sha256: c0713a43e323c3302c2abe2a1cc89aa057a387101ebd280371d6a6c9fa68516b url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.1.2" source_maps: dependency: transitive description: @@ -1955,10 +1955,10 @@ packages: dependency: transitive description: name: url_launcher_android - sha256: f0c73347dfcfa5b3db8bc06e1502668265d39c08f310c29bff4e28eea9699f79 + sha256: e35a698ac302dd68e41f73250bd9517fe3ab5fa4f18fe4647a0872db61bacbab url: "https://pub.dev" source: hosted - version: "6.3.9" + version: "6.3.10" url_launcher_ios: dependency: transitive description: @@ -2201,4 +2201,4 @@ packages: version: "3.1.2" sdks: dart: ">=3.5.0 <4.0.0" - flutter: ">=3.22.0" + flutter: ">=3.24.0" diff --git a/pubspec.yaml b/pubspec.yaml index 6217e171..96653fcc 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,7 +1,7 @@ name: carp_study_app description: The generic CARP study app. publish_to: "none" -version: 2.1.1+31 +version: 2.1.1+32 environment: sdk: ">=3.2.0 <4.0.0"