alqindiirsyam 2 yıl önce
ebeveyn
işleme
9bf19b9eef

+ 22 - 26
appbuilder-ios/AppBuilder/AppBuilder.xcodeproj/project.pbxproj

@@ -8,6 +8,7 @@
 
 /* Begin PBXBuildFile section */
 		12960AE02892361000A467DD /* FourthTabViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 12960ADF2892361000A467DD /* FourthTabViewController.swift */; };
+		1811163189ED9BD3012C81EA /* Pods_AppBuilder.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7EED0818A41A7AA38D20D42D /* Pods_AppBuilder.framework */; };
 		2401CE9A275490DB00B323BB /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2401CE99275490DB00B323BB /* AppDelegate.swift */; };
 		2401CE9C275490DB00B323BB /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2401CE9B275490DB00B323BB /* SceneDelegate.swift */; };
 		2401CE9E275490DB00B323BB /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2401CE9D275490DB00B323BB /* ViewController.swift */; };
@@ -27,7 +28,6 @@
 		A4B5F04427F193DD0089B871 /* Poppins-MediumItalic.ttf in Resources */ = {isa = PBXBuildFile; fileRef = A4B5F03D27F193DC0089B871 /* Poppins-MediumItalic.ttf */; };
 		CDEE3DCC29B06E1E00B420E5 /* NotificationService.swift in Sources */ = {isa = PBXBuildFile; fileRef = CDEE3DCB29B06E1E00B420E5 /* NotificationService.swift */; };
 		CDEE3DD029B06E1E00B420E5 /* NotificationService.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = CDEE3DC929B06E1E00B420E5 /* NotificationService.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
-		D97787F5841788DD7CA5D22E /* Pods_AppBuilder.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F9E4106B3479B94418329D80 /* Pods_AppBuilder.framework */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -65,10 +65,8 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
-		0DA67759833E5D05CCC5F918 /* Pods_AppBuilder_AppBuilderTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_AppBuilder_AppBuilderTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		12960ADF2892361000A467DD /* FourthTabViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FourthTabViewController.swift; sourceTree = "<group>"; };
-		17C212CC198CF15351DAB5D9 /* Pods-AppBuilder.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-AppBuilder.release.xcconfig"; path = "Target Support Files/Pods-AppBuilder/Pods-AppBuilder.release.xcconfig"; sourceTree = "<group>"; };
-		1AFA5DE79F538A842695875B /* Pods-AppBuilder.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-AppBuilder.debug.xcconfig"; path = "Target Support Files/Pods-AppBuilder/Pods-AppBuilder.debug.xcconfig"; sourceTree = "<group>"; };
+		20EDE21616BB9598D01BB6F2 /* Pods-AppBuilder.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-AppBuilder.release.xcconfig"; path = "Target Support Files/Pods-AppBuilder/Pods-AppBuilder.release.xcconfig"; sourceTree = "<group>"; };
 		2401CE96275490DB00B323BB /* AppBuilder.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = AppBuilder.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		2401CE99275490DB00B323BB /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		2401CE9B275490DB00B323BB /* SceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = "<group>"; };
@@ -77,7 +75,8 @@
 		2401CEA2275490E600B323BB /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		2401CEA5275490E600B323BB /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		2401CEA7275490E600B323BB /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		64D75EB30B05A0FFB0CD4A15 /* Pods_AppBuilder_AppBuilderUITests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_AppBuilder_AppBuilderUITests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		50B9F19BAE6BA07DD4309B74 /* Pods-AppBuilder.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-AppBuilder.debug.xcconfig"; path = "Target Support Files/Pods-AppBuilder/Pods-AppBuilder.debug.xcconfig"; sourceTree = "<group>"; };
+		7EED0818A41A7AA38D20D42D /* Pods_AppBuilder.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_AppBuilder.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		A413B18627EACB20006D16EB /* PrefsUtil.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PrefsUtil.swift; sourceTree = "<group>"; };
 		A42ED92127F30BA200B0FAB7 /* FirstTabViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FirstTabViewController.swift; sourceTree = "<group>"; };
 		A42ED92327F3FC2F00B0FAB7 /* SecondTabViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SecondTabViewController.swift; sourceTree = "<group>"; };
@@ -92,7 +91,6 @@
 		CDEE3DC929B06E1E00B420E5 /* NotificationService.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = NotificationService.appex; sourceTree = BUILT_PRODUCTS_DIR; };
 		CDEE3DCB29B06E1E00B420E5 /* NotificationService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationService.swift; sourceTree = "<group>"; };
 		CDEE3DCD29B06E1E00B420E5 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		F9E4106B3479B94418329D80 /* Pods_AppBuilder.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_AppBuilder.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -100,7 +98,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				D97787F5841788DD7CA5D22E /* Pods_AppBuilder.framework in Frameworks */,
+				1811163189ED9BD3012C81EA /* Pods_AppBuilder.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -114,6 +112,14 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
+		02DC771EDF0DEFAB858B2417 /* Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				7EED0818A41A7AA38D20D42D /* Pods_AppBuilder.framework */,
+			);
+			name = Frameworks;
+			sourceTree = "<group>";
+		};
 		2401CE8D275490DB00B323BB = {
 			isa = PBXGroup;
 			children = (
@@ -121,7 +127,7 @@
 				CDEE3DCA29B06E1E00B420E5 /* NotificationService */,
 				2401CE97275490DB00B323BB /* Products */,
 				6E32BCCF4DE50EE1A90E8AAE /* Pods */,
-				EC8D46330C460C606FF6529D /* Frameworks */,
+				02DC771EDF0DEFAB858B2417 /* Frameworks */,
 			);
 			sourceTree = "<group>";
 		};
@@ -157,8 +163,8 @@
 		6E32BCCF4DE50EE1A90E8AAE /* Pods */ = {
 			isa = PBXGroup;
 			children = (
-				1AFA5DE79F538A842695875B /* Pods-AppBuilder.debug.xcconfig */,
-				17C212CC198CF15351DAB5D9 /* Pods-AppBuilder.release.xcconfig */,
+				50B9F19BAE6BA07DD4309B74 /* Pods-AppBuilder.debug.xcconfig */,
+				20EDE21616BB9598D01BB6F2 /* Pods-AppBuilder.release.xcconfig */,
 			);
 			path = Pods;
 			sourceTree = "<group>";
@@ -186,16 +192,6 @@
 			path = NotificationService;
 			sourceTree = "<group>";
 		};
-		EC8D46330C460C606FF6529D /* Frameworks */ = {
-			isa = PBXGroup;
-			children = (
-				F9E4106B3479B94418329D80 /* Pods_AppBuilder.framework */,
-				0DA67759833E5D05CCC5F918 /* Pods_AppBuilder_AppBuilderTests.framework */,
-				64D75EB30B05A0FFB0CD4A15 /* Pods_AppBuilder_AppBuilderUITests.framework */,
-			);
-			name = Frameworks;
-			sourceTree = "<group>";
-		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
@@ -203,13 +199,13 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 2401CEC0275490E600B323BB /* Build configuration list for PBXNativeTarget "AppBuilder" */;
 			buildPhases = (
-				0F7EEEDCC8B3DA357207C77A /* [CP] Check Pods Manifest.lock */,
+				0D73753F4E7B4FEBAA2CA19D /* [CP] Check Pods Manifest.lock */,
 				2401CE92275490DB00B323BB /* Sources */,
 				2401CE93275490DB00B323BB /* Frameworks */,
 				2401CE94275490DB00B323BB /* Resources */,
-				66DF055B3D0DA2B0E04E06CA /* [CP] Embed Pods Frameworks */,
 				247E0A722796969200430E5F /* Embed Frameworks */,
 				CDEE3DD129B06E1E00B420E5 /* Embed Foundation Extensions */,
+				8F2E3197028B49A3BE8322F5 /* [CP] Embed Pods Frameworks */,
 			);
 			buildRules = (
 			);
@@ -302,7 +298,7 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
-		0F7EEEDCC8B3DA357207C77A /* [CP] Check Pods Manifest.lock */ = {
+		0D73753F4E7B4FEBAA2CA19D /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -324,7 +320,7 @@
 			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
-		66DF055B3D0DA2B0E04E06CA /* [CP] Embed Pods Frameworks */ = {
+		8F2E3197028B49A3BE8322F5 /* [CP] Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -515,7 +511,7 @@
 		};
 		2401CEC1275490E600B323BB /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 1AFA5DE79F538A842695875B /* Pods-AppBuilder.debug.xcconfig */;
+			baseConfigurationReference = 50B9F19BAE6BA07DD4309B74 /* Pods-AppBuilder.debug.xcconfig */;
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
@@ -547,7 +543,7 @@
 		};
 		2401CEC2275490E600B323BB /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 17C212CC198CF15351DAB5D9 /* Pods-AppBuilder.release.xcconfig */;
+			baseConfigurationReference = 20EDE21616BB9598D01BB6F2 /* Pods-AppBuilder.release.xcconfig */;
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;

+ 6 - 6
appbuilder-ios/NexilisLite/NexilisLite.podspec

@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |spec|
   spec.name         = "NexilisLite"
-  spec.version      = "1.0.5"
+  spec.version      = "1.0.6"
   spec.summary      = "NexilisLite Framework"
   spec.description  = <<-DESC
   NexilisLite Framework, embed Contact Center, Live Streaming, Push Notifications, Instant Messaging, Video and VoIP Calling features into your mobile apps within minutes...
@@ -18,13 +18,13 @@ Pod::Spec.new do |spec|
   spec.license      = "MIT"
   spec.author       = { "Yayan D Wicaksono" => "ya2n.wicaksono@gmail.com" }
   spec.ios.deployment_target = "14.0"
-  spec.source       = { :http => 'https://newuniverse.io/UCPaaSiOS/releases/download/NexilisLiteiOS/v1.0.5/NexilisLite.zip' }
-#  spec.source       = { :path => '.' }
-#  spec.source_files = 'NexilisLite/Source/**/*'
-#  spec.resource_bundles = { 'NexilisLite' => ['NexilisLite/Resource/**/*']}
+#  spec.source       = { :http => 'https://newuniverse.io/UCPaaSiOS/releases/download/NexilisLiteiOS/v1.0.6/NexilisLite.zip' }
+  spec.source       = { :path => '.' }
+  spec.source_files = 'NexilisLite/Source/**/*'
+  spec.resource_bundles = { 'NexilisLite' => ['NexilisLite/Resource/**/*']}
   spec.swift_version = '5.5.1'
   spec.dependency 'FMDB', '~> 2.7.5'
-  spec.dependency 'nuSDKService', '~> 0.0.8'
+  spec.dependency 'nuSDKService', '~> 0.0.9'
   spec.dependency 'NotificationBannerSwift', '~> 3.2.1'
   spec.dependency 'Alamofire', '~> 5.7.0'
   spec.dependency 'SDWebImage', '~> 5.15.7'

+ 8 - 10
appbuilder-ios/NexilisLite/NexilisLite.xcodeproj/project.pbxproj

@@ -7,8 +7,7 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		3CDA2F756FB5808DC8BA14B0 /* Pods_NexilisLite_NexilisLiteTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6C3262008D2AFCB928D8A117 /* Pods_NexilisLite_NexilisLiteTests.framework */; };
-		AD907977B27E83D2C5DFE528 /* Pods_NexilisLite.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 41367FB372DC17C5D7DC06C1 /* Pods_NexilisLite.framework */; };
+		B70E6EEE42E8599AE3E234EB /* Pods_NexilisLite.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B4C6CACD7DA8A9F327A41E45 /* Pods_NexilisLite.framework */; };
 		CD1E6E6D2A0B7C3600BF871F /* NexilisLite.docc in Sources */ = {isa = PBXBuildFile; fileRef = CD1E6E6C2A0B7C3600BF871F /* NexilisLite.docc */; };
 		CD1E6E732A0B7C3600BF871F /* NexilisLite.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CD1E6E682A0B7C3600BF871F /* NexilisLite.framework */; };
 		CD1E6E782A0B7C3600BF871F /* NexilisLiteTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD1E6E772A0B7C3600BF871F /* NexilisLiteTests.swift */; };
@@ -188,6 +187,7 @@
 		CD46A0BB2A0CE320009E4C87 /* sticker_10000000_8.png in Resources */ = {isa = PBXBuildFile; fileRef = CD46A0162A0CE2DE009E4C87 /* sticker_10000000_8.png */; };
 		CD46A0BF2A0CE4FD009E4C87 /* NexilisLite.podspec in Resources */ = {isa = PBXBuildFile; fileRef = CD46A0BE2A0CE4FD009E4C87 /* NexilisLite.podspec */; };
 		CD46A0C52A0D0D5D009E4C87 /* MyArchive.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD46A0C42A0D0D5D009E4C87 /* MyArchive.swift */; };
+		E041D3F3664E6832F1C7D472 /* Pods_NexilisLite_NexilisLiteTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 29B82D1BED77BA49C75DE10C /* Pods_NexilisLite_NexilisLiteTests.framework */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -223,10 +223,10 @@
 /* Begin PBXFileReference section */
 		20C4CB5AC0587988A5920E59 /* Pods-NexilisLite-NexilisLiteTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-NexilisLite-NexilisLiteTests.debug.xcconfig"; path = "Target Support Files/Pods-NexilisLite-NexilisLiteTests/Pods-NexilisLite-NexilisLiteTests.debug.xcconfig"; sourceTree = "<group>"; };
 		21404A523FB436B8AEC7E4EC /* Pods-NexilisLite.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-NexilisLite.release.xcconfig"; path = "Target Support Files/Pods-NexilisLite/Pods-NexilisLite.release.xcconfig"; sourceTree = "<group>"; };
+		29B82D1BED77BA49C75DE10C /* Pods_NexilisLite_NexilisLiteTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_NexilisLite_NexilisLiteTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		3061C3DBD93D011424C9863F /* Pods-NexilisLite.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-NexilisLite.debug.xcconfig"; path = "Target Support Files/Pods-NexilisLite/Pods-NexilisLite.debug.xcconfig"; sourceTree = "<group>"; };
-		41367FB372DC17C5D7DC06C1 /* Pods_NexilisLite.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_NexilisLite.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		4BEC265A00B388B11B91C0A2 /* Pods-NexilisLite-NexilisLiteTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-NexilisLite-NexilisLiteTests.release.xcconfig"; path = "Target Support Files/Pods-NexilisLite-NexilisLiteTests/Pods-NexilisLite-NexilisLiteTests.release.xcconfig"; sourceTree = "<group>"; };
-		6C3262008D2AFCB928D8A117 /* Pods_NexilisLite_NexilisLiteTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_NexilisLite_NexilisLiteTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		B4C6CACD7DA8A9F327A41E45 /* Pods_NexilisLite.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_NexilisLite.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		CD1E6E682A0B7C3600BF871F /* NexilisLite.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = NexilisLite.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		CD1E6E6B2A0B7C3600BF871F /* NexilisLite.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NexilisLite.h; sourceTree = "<group>"; };
 		CD1E6E6C2A0B7C3600BF871F /* NexilisLite.docc */ = {isa = PBXFileReference; lastKnownFileType = folder.documentationcatalog; path = NexilisLite.docc; sourceTree = "<group>"; };
@@ -424,7 +424,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				AD907977B27E83D2C5DFE528 /* Pods_NexilisLite.framework in Frameworks */,
+				B70E6EEE42E8599AE3E234EB /* Pods_NexilisLite.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -433,7 +433,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				CD1E6E732A0B7C3600BF871F /* NexilisLite.framework in Frameworks */,
-				3CDA2F756FB5808DC8BA14B0 /* Pods_NexilisLite_NexilisLiteTests.framework in Frameworks */,
+				E041D3F3664E6832F1C7D472 /* Pods_NexilisLite_NexilisLiteTests.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -457,8 +457,8 @@
 				CD1E79142A0CA43600BF871F /* SDWebImage.framework */,
 				CD1E79152A0CA43600BF871F /* SnapKit.framework */,
 				CD1E79162A0CA43600BF871F /* Toast_Swift.framework */,
-				41367FB372DC17C5D7DC06C1 /* Pods_NexilisLite.framework */,
-				6C3262008D2AFCB928D8A117 /* Pods_NexilisLite_NexilisLiteTests.framework */,
+				B4C6CACD7DA8A9F327A41E45 /* Pods_NexilisLite.framework */,
+				29B82D1BED77BA49C75DE10C /* Pods_NexilisLite_NexilisLiteTests.framework */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
@@ -1372,7 +1372,6 @@
 				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_VERSION = 5.0;
-				TARGETED_DEVICE_FAMILY = 1;
 			};
 			name = Debug;
 		};
@@ -1413,7 +1412,6 @@
 				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_VERSION = 5.0;
-				TARGETED_DEVICE_FAMILY = 1;
 			};
 			name = Release;
 		};

+ 1 - 1
appbuilder-ios/NexilisLite/Podfile

@@ -7,7 +7,7 @@ target 'NexilisLite' do
 
   # Pods for NexilisLite
 
-  pod 'nuSDKService', '~> 0.0.8'
+  pod 'nuSDKService', '~> 0.0.9'
   pod 'FMDB', '~> 2.7.5'
   pod 'NotificationBannerSwift', '~> 3.2.1'
   pod 'Alamofire', '~> 5.7.0'

+ 4 - 4
appbuilder-ios/NexilisLite/Podfile.lock

@@ -7,7 +7,7 @@ PODS:
   - NotificationBannerSwift (3.2.1):
     - MarqueeLabel (~> 4.3.0)
     - SnapKit (~> 5.6.0)
-  - nuSDKService (0.0.8)
+  - nuSDKService (0.0.9)
   - SDWebImage (5.15.7):
     - SDWebImage/Core (= 5.15.7)
   - SDWebImage/Core (5.15.7)
@@ -20,7 +20,7 @@ DEPENDENCIES:
   - Alamofire (~> 5.7.0)
   - FMDB (~> 2.7.5)
   - NotificationBannerSwift (~> 3.2.1)
-  - nuSDKService (~> 0.0.8)
+  - nuSDKService (~> 0.0.9)
   - SDWebImage (~> 5.15.7)
   - SwiftLinkPreview (~> 3.4.0)
   - Toast-Swift (~> 5.0.1)
@@ -44,13 +44,13 @@ SPEC CHECKSUMS:
   FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
   MarqueeLabel: 02f5ac8fd6877c94564556cb93fa86c70c08baeb
   NotificationBannerSwift: dce54ded532b26e30cd8e7f4d80e124a0f2ba7d1
-  nuSDKService: 6bb78ce9e114a171172614761b918a14fbf4d559
+  nuSDKService: af6fae2aa49fcce7a5f2396fc54b2fa4b1389d34
   SDWebImage: 25bac438318faf37e35650619ebc288a9061d292
   SnapKit: e01d52ebb8ddbc333eefe2132acf85c8227d9c25
   SwiftLinkPreview: c1bc5b2cb3cd42f2865137c1a61f5d788dcf5c9c
   Toast-Swift: 9b6a70f28b3bf0b96c40d46c0c4b9d6639846711
   ZIPFoundation: d170fa8e270b2a32bef9dcdcabff5b8f1a5deced
 
-PODFILE CHECKSUM: 314d3e9389b71e9791edce45c0854af4fbb68483
+PODFILE CHECKSUM: 0eb92c29fe04572198e226806982831ccf987e9f
 
 COCOAPODS: 1.12.1

+ 12 - 10
src/mainPalio4.py

@@ -536,16 +536,18 @@ def change_huawei_file(path_dest, huawei_file, package_id):
         with open(main_code_path, "w") as f:
             f.write(replaced)
 
-def change_fms_file(path_dest, fms_enable, package_id):
+def change_fms_file(path_dest, fms_enable):
     if fms_enable == 0:
-        path_package_id = package_id.replace(".", "/")
-        code_path = "app/src/main/java/"
-        main_code_path = os.path.join(path_dest, code_path, path_package_id, "MAB.java")
-        with open(main_code_path, "r") as f:
-            file_source = f.read()
-        replaced = file_source.replace('isFMSEnabled = true', 'isFMSEnabled = false')
-        with open(main_code_path, "w") as f:
-            f.write(replaced)
+        build_gradle = os.path.join(path_dest, 'app/build.gradle')
+        with open(build_gradle, "r") as f:
+            lines = f.readlines()
+        with open(build_gradle, "w") as f:
+            for line in lines:
+                if "withfcm" in line:
+                    continue
+                else:
+                    f.write(line)
+
 
 def run_build(path_dest):
     gradlew = os.path.join(path_dest, "gradlew")
@@ -809,7 +811,7 @@ def build_apk():
             change_access(path_dest, access_model, package_id)
             change_tab(path_dest, tabs, tab_icon, package_id, tab3_mode, tab_amount)
             change_huawei_file(path_dest, huawei_file, package_id)
-            change_fms_file(path_dest, fms_enable, package_id)
+            change_fms_file(path_dest, fms_enable)
         except BaseException as e:
             vprint(traceback.format_exc())
             return {"status": "2", "message": "Process failure\n{}\n".format(str(e))}