renamed bundle ids to com.wildlife.wildlifewatcher

wildlifeai · Mar 30, 2024 · d632127 · d632127
1 parent 24bdeb3
commit d632127
Show file tree

Hide file tree

Showing 9 changed files with 32 additions and 33 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -58,7 +58,7 @@ jobs:
           IOS_CERT_PASSWORD: ${{ secrets.IOS_CERT_PASSWORD }}
           IOS_KEYCHAIN_PASSWORD: ${{ secrets.IOS_KEYCHAIN_PASSWORD }}
           APP_VERSION: ${{ needs.extract-version.outputs.version }}
-          APP_ID: ${{ secrets.APP_ID_IOS }}
+          APP_ID: ${{ vars.APP_ID_IOS }}
           TESTERS: ${{ vars.TESTERS }}
   android-build:
     needs: extract-version
@@ -105,5 +105,5 @@ jobs:
         env:
           APP_VERSION: ${{ needs.extract-version.outputs.version }}
           APP_CODE_VERSION: ${{ github.run_number }}
-          APP_ID: ${{ secrets.APP_ID_ANDROID }}
+          APP_ID: ${{ vars.APP_ID_ANDROID }}
           TESTERS: ${{ vars.TESTERS }}
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -83,9 +83,9 @@ android {
     buildToolsVersion rootProject.ext.buildToolsVersion
     compileSdk rootProject.ext.compileSdkVersion
 
-    namespace "com.wildlifewatcher"
+    namespace "com.wildlife.wildlifewatcher"
     defaultConfig {
-        applicationId "com.wildlifewatcher"
+        applicationId "com.wildlife.wildlifewatcher"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode 1

diff --git a/.../java/com/wildlifewatcher/MainActivity.kt → .../wildlife/wildlifewatcher/MainActivity.kt b/.../java/com/wildlifewatcher/MainActivity.kt → .../wildlife/wildlifewatcher/MainActivity.kt
@@ -1,4 +1,4 @@
-package com.wildlifewatcher
+package com.wildlife.wildlifewatcher
 
 import com.facebook.react.ReactActivity
 import com.facebook.react.ReactActivityDelegate

diff --git a/...va/com/wildlifewatcher/MainApplication.kt → ...ldlife/wildlifewatcher/MainApplication.kt b/...va/com/wildlifewatcher/MainApplication.kt → ...ldlife/wildlifewatcher/MainApplication.kt
@@ -1,4 +1,4 @@
-package com.wildlifewatcher
+package com.wildlife.wildlifewatcher
 
 import android.app.Application
 import com.facebook.react.PackageList

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
@@ -41,6 +41,11 @@ platform :ios do
       xcodeproj: "./ios/WildlifeWatcher.xcodeproj"
     )
 
+    ios_set_build_number(
+      build_number: ENV['APP_CODE_VERSION'],
+      xcodeproj: "./ios/WildlifeWatcher.xcodeproj"
+    )
+
     build_ios_app(
       silent: true,
       scheme: 'WildlifeWatcher', 
@@ -55,7 +60,7 @@ platform :ios do
     )
 
     firebase_app_distribution(
-      app: ENV["APP_ID_IOS"],
+      app: ENV["APP_ID"],
       service_credentials_file: "./fastlane/wildlife-watcher-service-account.json",
       testers: ENV['TESTERS']
     )

diff --git a/fastlane/README.md b/fastlane/README.md
@@ -15,14 +15,6 @@ For _fastlane_ installation instructions, see [Installing _fastlane_](https://do
 
 ## iOS
 
-### ios build_debug
-
-```sh
-[bundle exec] fastlane ios build_debug
-```
-
-Build a debug version of the app
-
 ### ios build_release
 
 ```sh

diff --git a/ios/WildlifeWatcher.xcodeproj/project.pbxproj b/ios/WildlifeWatcher.xcodeproj/project.pbxproj
@@ -18,19 +18,19 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
-		13B07F961A680F5B00A75B9A /* WildlifeWatcher.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = WildlifeWatcher.app; sourceTree = BUILT_PRODUCTS_DIR; };
-		13B07FAF1A68108700A75B9A /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = WildlifeWatcher/AppDelegate.h; sourceTree = "<group>"; };
-		13B07FB01A68108700A75B9A /* AppDelegate.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = AppDelegate.mm; path = WildlifeWatcher/AppDelegate.mm; sourceTree = "<group>"; };
-		13B07FB51A68108700A75B9A /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = WildlifeWatcher/Images.xcassets; sourceTree = "<group>"; };
-		13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = WildlifeWatcher/Info.plist; sourceTree = "<group>"; };
-		13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = WildlifeWatcher/main.m; sourceTree = "<group>"; };
+		13B07F961A680F5B00A75B9A /* WildlifeWatcher.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "WildlifeWatcher.app"; sourceTree = BUILT_PRODUCTS_DIR; };
+		13B07FAF1A68108700A75B9A /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = "WildlifeWatcher/AppDelegate.h"; sourceTree = "<group>"; };
+		13B07FB01A68108700A75B9A /* AppDelegate.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = AppDelegate.mm; path = "WildlifeWatcher/AppDelegate.mm"; sourceTree = "<group>"; };
+		13B07FB51A68108700A75B9A /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = "WildlifeWatcher/Images.xcassets"; sourceTree = "<group>"; };
+		13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = "WildlifeWatcher/Info.plist"; sourceTree = "<group>"; };
+		13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = "WildlifeWatcher/main.m"; sourceTree = "<group>"; };
 		3B4392A12AC88292D35C810B /* Pods-WildlifeWatcher.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-WildlifeWatcher.debug.xcconfig"; path = "Target Support Files/Pods-WildlifeWatcher/Pods-WildlifeWatcher.debug.xcconfig"; sourceTree = "<group>"; };
 		5709B34CF0A7D63546082F79 /* Pods-WildlifeWatcher.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-WildlifeWatcher.release.xcconfig"; path = "Target Support Files/Pods-WildlifeWatcher/Pods-WildlifeWatcher.release.xcconfig"; sourceTree = "<group>"; };
 		5711C2354CC7138C874EE17D /* Pods_WildlifeWatcher.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_WildlifeWatcher.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		5B7EB9410499542E8C5724F5 /* Pods-WildlifeWatcher-WildlifeWatcherTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-WildlifeWatcher-WildlifeWatcherTests.debug.xcconfig"; path = "Target Support Files/Pods-WildlifeWatcher-WildlifeWatcherTests/Pods-WildlifeWatcher-WildlifeWatcherTests.debug.xcconfig"; sourceTree = "<group>"; };
 		6C6CBE172B46D817008BC87C /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; };
 		6CB1640B2B30D57400FD6057 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; };
-		81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = LaunchScreen.storyboard; path = WildlifeWatcher/LaunchScreen.storyboard; sourceTree = "<group>"; };
+		81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = LaunchScreen.storyboard; path = "WildlifeWatcher/LaunchScreen.storyboard"; sourceTree = "<group>"; };
 		89C6BE57DB24E9ADA2F236DE /* Pods-WildlifeWatcher-WildlifeWatcherTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-WildlifeWatcher-WildlifeWatcherTests.release.xcconfig"; path = "Target Support Files/Pods-WildlifeWatcher-WildlifeWatcherTests/Pods-WildlifeWatcher-WildlifeWatcherTests.release.xcconfig"; sourceTree = "<group>"; };
 		8F50F92FA7F44634B5FEE4B9 /* BootSplash.storyboard */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = BootSplash.storyboard; path = WildlifeWatcher/BootSplash.storyboard; sourceTree = "<group>"; };
 		ED297162215061F000B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; };
@@ -60,7 +60,7 @@
 				13B07FB71A68108700A75B9A /* main.m */,
 				8F50F92FA7F44634B5FEE4B9 /* BootSplash.storyboard */,
 			);
-			name = WildlifeWatcher;
+			name = "WildlifeWatcher";
 			sourceTree = "<group>";
 		};
 		2D16E6871FA4F8E400B85C8A /* Frameworks */ = {
@@ -135,8 +135,8 @@
 			);
 			dependencies = (
 			);
-			name = WildlifeWatcher;
-			productName = WildlifeWatcher;
+			name = "WildlifeWatcher";
+			productName = "WildlifeWatcher";
 			productReference = 13B07F961A680F5B00A75B9A /* WildlifeWatcher.app */;
 			productType = "com.apple.product-type.application";
 		};
@@ -298,7 +298,8 @@
 				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = D6C4Y4J2BS;
 				ENABLE_BITCODE = NO;
-				INFOPLIST_FILE = WildlifeWatcher/Info.plist;
+				INFOPLIST_FILE = "WildlifeWatcher/Info.plist";
+             INFOPLIST_KEY_CFBundleDisplayName = "WildlifeWatcher";
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -309,8 +310,8 @@
 					"-ObjC",
 					"-lc++",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.wildlife.wildlifewatcher;
-				PRODUCT_NAME = WildlifeWatcher;
+				PRODUCT_BUNDLE_IDENTIFIER = "com.wildlife.wildlifewatcher";
+				PRODUCT_NAME = "WildlifeWatcher";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 5.0;
@@ -330,7 +331,8 @@
 				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = D6C4Y4J2BS;
-				INFOPLIST_FILE = WildlifeWatcher/Info.plist;
+				INFOPLIST_FILE = "WildlifeWatcher/Info.plist";
+             INFOPLIST_KEY_CFBundleDisplayName = "WildlifeWatcher";
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -341,8 +343,8 @@
 					"-ObjC",
 					"-lc++",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.wildlife.wildlifewatcher;
-				PRODUCT_NAME = WildlifeWatcher;
+				PRODUCT_BUNDLE_IDENTIFIER = "com.wildlife.wildlifewatcher";
+				PRODUCT_NAME = "WildlifeWatcher";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "Wildlife Watcher App Store";
 				SWIFT_VERSION = 5.0;

diff --git a/ios/WildlifeWatcher/Info.plist b/ios/WildlifeWatcher/Info.plist
@@ -36,7 +36,7 @@
 	<key>NSBluetoothPeripheralUsageDescription</key>
 	<string>We need access to your bluetooth connection to connect to your devices and enable their remote configuration.</string>
 	<key>NSLocationWhenInUseUsageDescription</key>
-	<string></string>
+	<string/>
 	<key>UILaunchStoryboardName</key>
 	<string>BootSplash.storyboard</string>
 	<key>UIRequiredDeviceCapabilities</key>

diff --git a/package.json b/package.json
@@ -1,5 +1,5 @@
 {
-	"name": "WildlifeWatcher",
+	"name": "wildlifewatcher",
 	"version": "0.0.1",
 	"private": true,
 	"scripts": {