Skip to content

Commit

Permalink
iOS: fix fcm-push
Browse files Browse the repository at this point in the history
  • Loading branch information
dmitrys committed Jun 1, 2023
1 parent 43ee6bf commit 043b5ae
Show file tree
Hide file tree
Showing 5 changed files with 29 additions and 13 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -331,3 +331,5 @@ lib/extensions/fcm-push/ext/iphone/Frameworks/*
lib/extensions/fcm-push/ext/iphone/Frameworks/Frameworks.zip

**/com/rho/barcode/EngineChooser.java

**/iphone/Pods
17 changes: 15 additions & 2 deletions lib/extensions/fcm-push/ext/iphone/Podfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
platform :ios, '10.0'
#use_frameworks!
platform :ios, '12.0'
use_frameworks!
#use_modular_headers!

project 'fcm-push.xcodeproj'

Expand All @@ -9,3 +10,15 @@ pod 'Firebase/Messaging'

target 'fcm-push' do
end

post_install do |installer|
installer.pods_project.targets.each do |target|
target.build_configurations.each do |config|
if target.respond_to?(:product_type) and target.product_type == "com.apple.product-type.bundle"
target.build_configurations.each do |config|
config.build_settings['CODE_SIGNING_ALLOWED'] = 'NO'
end
end
end
end
end
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
objects = {

/* Begin PBXBuildFile section */
B1618C73C1AFDF2D84EDF1B3 /* libPods-fcm-push.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 96A61BE3E184A0E6B57CF9D2 /* libPods-fcm-push.a */; };
DE3320874BA7A270A0ADF5E8 /* Pods_fcm_push.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A4AB037FE0CB3EB218E130A /* Pods_fcm_push.framework */; };
FAC155E7145855CF0016F3BD /* applePush_Prefix.pch in Headers */ = {isa = PBXBuildFile; fileRef = FAD45FD51225FED600141873 /* applePush_Prefix.pch */; };
FAC155EE145855CF0016F3BD /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AACBBE490F95108600F1A2B1 /* Foundation.framework */; };
FAC155EF145855CF0016F3BD /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FAD4602C12260A8500141873 /* UIKit.framework */; };
Expand All @@ -19,8 +19,8 @@
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
4A4AB037FE0CB3EB218E130A /* Pods_fcm_push.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_fcm_push.framework; sourceTree = BUILT_PRODUCTS_DIR; };
4CDA3BB94718F541853D0BC4 /* Pods-fcm-push.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-fcm-push.debug.xcconfig"; path = "Target Support Files/Pods-fcm-push/Pods-fcm-push.debug.xcconfig"; sourceTree = "<group>"; };
96A61BE3E184A0E6B57CF9D2 /* libPods-fcm-push.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-fcm-push.a"; sourceTree = BUILT_PRODUCTS_DIR; };
AACBBE490F95108600F1A2B1 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
C4D0AD1B4A0521913C12576B /* Pods-fcm-push.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-fcm-push.release.xcconfig"; path = "Target Support Files/Pods-fcm-push/Pods-fcm-push.release.xcconfig"; sourceTree = "<group>"; };
FAC155F3145855CF0016F3BD /* libfcm-push.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libfcm-push.a"; sourceTree = BUILT_PRODUCTS_DIR; };
Expand All @@ -40,7 +40,7 @@
files = (
FAC155EE145855CF0016F3BD /* Foundation.framework in Frameworks */,
FAC155EF145855CF0016F3BD /* UIKit.framework in Frameworks */,
B1618C73C1AFDF2D84EDF1B3 /* libPods-fcm-push.a in Frameworks */,
DE3320874BA7A270A0ADF5E8 /* Pods_fcm_push.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -72,7 +72,7 @@
children = (
AACBBE490F95108600F1A2B1 /* Foundation.framework */,
FAD4602C12260A8500141873 /* UIKit.framework */,
96A61BE3E184A0E6B57CF9D2 /* libPods-fcm-push.a */,
4A4AB037FE0CB3EB218E130A /* Pods_fcm_push.framework */,
);
name = Frameworks;
sourceTree = "<group>";
Expand All @@ -99,7 +99,6 @@
4CDA3BB94718F541853D0BC4 /* Pods-fcm-push.debug.xcconfig */,
C4D0AD1B4A0521913C12576B /* Pods-fcm-push.release.xcconfig */,
);
name = Pods;
path = Pods;
sourceTree = "<group>";
};
Expand Down Expand Up @@ -340,7 +339,7 @@
../../../../../lib/commonAPI/coreapi/ext/shared,
);
INSTALL_PATH = /usr/local/lib;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
MACOSX_DEPLOYMENT_TARGET = 10.5;
PRODUCT_NAME = "fcm-push";
SDKROOT = iphoneos;
Expand Down Expand Up @@ -387,7 +386,7 @@
../../../../../lib/commonAPI/coreapi/ext/shared,
);
INSTALL_PATH = /usr/local/lib;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
MACOSX_DEPLOYMENT_TARGET = 10.5;
PRODUCT_NAME = "fcm-push";
SDKROOT = iphoneos;
Expand Down
9 changes: 5 additions & 4 deletions platform/iphone/rbuild/iphone.rake
Original file line number Diff line number Diff line change
Expand Up @@ -936,15 +936,16 @@ def update_xcode_project_files_by_capabilities
hash_dev_ent = load_plist(dev_ent)
hash_prd_ent = load_plist(prd_ent)

#if($push_type == FCM_PUSH)
if($push_type == FCM_PUSH)
#framework_src = File.join($startdir, 'lib', 'extensions', 'fcm-push', 'ext', 'iphone', 'Frameworks')
#firebase_h_src = File.join($startdir, 'platform', 'iphone', 'Firebase.h')
#googleservice_plist_src = File.join($startdir, 'platform', 'iphone', 'GoogleService-Info.plist')
#framework_dst = File.join($app_path, 'project', 'iphone')
googleservice_plist_src = File.join($app_path, 'GoogleService-Info.plist')
framework_dst = File.join($app_path, 'project', 'iphone')
#cp_r framework_src, framework_dst
#cp_r firebase_h_src, framework_dst
#cp_r googleservice_plist_src, framework_dst
#end
cp_r googleservice_plist_src, framework_dst
end

#bluetooth
bt_capability = false
Expand Down
1 change: 1 addition & 0 deletions rhodes.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ Gem::Specification.new do |s|
s.rdoc_options = ["--inline-source", "--charset=UTF-8", '--exclude=bin', '--exclude=doc', '--exclude=ext', '--exclude=installer', '--exclude=lib/build', '--exclude=lib/commonAPI', '--exclude=lib/extensions', '--exclude=lib/rhodes', '--exclude=lib/test', '--exclude=lib/rhodes.rb', '--exclude=platform', '--exclude=res', '--exclude=spec']
s.require_paths = ["lib"]
s.required_ruby_version = '>= 2.3'
s.add_dependency('cocoapods', '~> 1.11.1') if RUBY_PLATFORM =~ /darwin/i
s.add_dependency('templater', '1.0.0')
s.add_dependency('rake', '12.3.3')
s.add_dependency('uuid', '2.3.7')
Expand Down

0 comments on commit 043b5ae

Please sign in to comment.