فهرست منبع

Merge branch 'master' of https://ac.tastecn.com/github/wormwood-juiceplus/strides

vbea 2 سال پیش
والد
کامیت
ce08370f43
2فایلهای تغییر یافته به همراه25 افزوده شده و 6 حذف شده
  1. 22 5
      Strides-APP/ios/JuicePlus.xcodeproj/project.pbxproj
  2. 3 1
      Strides-APP/ios/JuicePlus/Info.plist

+ 22 - 5
Strides-APP/ios/JuicePlus.xcodeproj/project.pbxproj

@@ -35,6 +35,13 @@
 			remoteGlobalIDString = 0CEDE9F988A667E9E55A853581258D15;
 			remoteInfo = RNI18n;
 		};
+		25C62D882A5563B10008A89E /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 3862FE5D2668D3C90097D3A3 /* Pods.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 8CC9178C366942FD6FF6A115604EAD58;
+			remoteInfo = FirebaseCoreDiagnostics;
+		};
 		3806701826DF20DA00271DFA /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 3862FE5D2668D3C90097D3A3 /* Pods.xcodeproj */;
@@ -672,6 +679,7 @@
 				3862FE992668D3C90097D3A3 /* DoubleConversion */,
 				3862FE9B2668D3C90097D3A3 /* FBReactNativeSpec */,
 				3806701926DF20DA00271DFA /* FirebaseCore */,
+				25C62D892A5563B10008A89E /* FirebaseCoreDiagnostics */,
 				732F2CF7296FA69A00A90ECF /* FirebaseCoreInternal */,
 				3806701D26DF20DA00271DFA /* FirebaseInstallations */,
 				3806701F26DF20DA00271DFA /* FirebaseMessaging */,
@@ -882,6 +890,14 @@
 			remoteRef = 25450AEF2A554B630078250E /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
+		25C62D892A5563B10008A89E /* FirebaseCoreDiagnostics */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			name = FirebaseCoreDiagnostics;
+			path = libFirebaseCoreDiagnostics.a;
+			remoteRef = 25C62D882A5563B10008A89E /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
 		3806701926DF20DA00271DFA /* FirebaseCore */ = {
 			isa = PBXReferenceProxy;
 			fileType = archive.ar;
@@ -1664,6 +1680,7 @@
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				BUNDLE_LOADER = "$(TEST_HOST)";
+				DEVELOPMENT_TEAM = 3L3U7K6Q28;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"DEBUG=1",
 					"$(inherited)",
@@ -1695,7 +1712,7 @@
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
 				COPY_PHASE_STRIP = NO;
-				DEVELOPMENT_TEAM = TK7T9A6RQ2;
+				DEVELOPMENT_TEAM = 3L3U7K6Q28;
 				INFOPLIST_FILE = JuicePlusTests/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -1737,7 +1754,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = JuicePlus/JuicePlus.entitlements;
-				CURRENT_PROJECT_VERSION = 130;
+				CURRENT_PROJECT_VERSION = 132;
 				DEVELOPMENT_TEAM = 3L3U7K6Q28;
 				ENABLE_BITCODE = YES;
 				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
@@ -1748,7 +1765,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.3.1;
+				MARKETING_VERSION = 2.4.0;
 				OTHER_CFLAGS = (
 					"$(inherited)",
 					"-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCoreInternal/FirebaseCoreInternal.modulemap\"",
@@ -1790,7 +1807,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = JuicePlus/JuicePlus.entitlements;
-				CURRENT_PROJECT_VERSION = 130;
+				CURRENT_PROJECT_VERSION = 132;
 				DEVELOPMENT_TEAM = 3L3U7K6Q28;
 				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
 				INFOPLIST_FILE = JuicePlus/Info.plist;
@@ -1800,6 +1817,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
+				MARKETING_VERSION = 2.4.0;
 				OTHER_CFLAGS = (
 					"$(inherited)",
 					"-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCoreInternal/FirebaseCoreInternal.modulemap\"",
@@ -1817,7 +1835,6 @@
 					"-DREACT_NATIVE_MINOR_VERSION=64",
 					"-DREANIMATED_VERSION=2.14.4",
 				);
-				MARKETING_VERSION = 2.3.1;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",

+ 3 - 1
Strides-APP/ios/JuicePlus/Info.plist

@@ -2,6 +2,8 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>ITSAppUsesNonExemptEncryption</key>
+	<false/>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleDisplayName</key>
@@ -98,7 +100,7 @@
 		<string>remote-notification</string>
 	</array>
 	<key>UILaunchStoryboardName</key>
-	<string>LaunchScreen.storyboard</string>
+	<string>LaunchScreen</string>
 	<key>UIMainStoryboardFile</key>
 	<string>LaunchScreen</string>
 	<key>UIRequiredDeviceCapabilities</key>