diff --git a/example/ios-demo/PushDemo.xcodeproj/project.pbxproj b/example/ios-demo/PushDemo.xcodeproj/project.pbxproj index 0150ce7f..2cef9653 100644 --- a/example/ios-demo/PushDemo.xcodeproj/project.pbxproj +++ b/example/ios-demo/PushDemo.xcodeproj/project.pbxproj @@ -22,7 +22,7 @@ 13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; }; 140ED2AC1D01E1AD002B40FF /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 146834041AC3E56700842450 /* libReact.a */; }; 146834051AC3E58100842450 /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 146834041AC3E56700842450 /* libReact.a */; }; - 27193A72E28A416793C4AF78 /* libRCTJPushModule.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C813ACB0E75B40779131D220 /* libRCTJPushModule.a */; }; + 62C31F731E556D9300AC54A4 /* libRCTJPushModule.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 62C31F721E556D5600AC54A4 /* libRCTJPushModule.a */; }; 832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 832341B51AAA6A8300B99B32 /* libRCTText.a */; }; /* End PBXBuildFile section */ @@ -90,13 +90,6 @@ remoteGlobalIDString = 83CBBA2E1A601D0E00E9B192; remoteInfo = React; }; - 6228AFE51DA8BEE100862BA3 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = B1925385AB2543288721BE4D /* RCTJPushModule.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 6280980A1CEDC407000D3A81; - remoteInfo = RCTJPushModule; - }; 623BBA471E49AC4F00186A4D /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 00C302BB1ABCB91800DB3ED1 /* RCTImage.xcodeproj */; @@ -188,6 +181,13 @@ remoteGlobalIDString = 3D3CD9181DE5FBD800167DC4; remoteInfo = "jschelpers-tvOS"; }; + 62C31F711E556D5600AC54A4 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 62C31F6D1E556D5600AC54A4 /* RCTJPushModule.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 6280980A1CEDC407000D3A81; + remoteInfo = RCTJPushModule; + }; 78C398B81ACF4ADC00677621 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 78C398B01ACF4ADC00677621 /* RCTLinking.xcodeproj */; @@ -225,10 +225,9 @@ 13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = PushDemo/main.m; sourceTree = ""; }; 146833FF1AC3E56700842450 /* React.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = React.xcodeproj; path = "../node_modules/react-native/React/React.xcodeproj"; sourceTree = ""; }; 6228B0721DA8D09D00862BA3 /* PushDemo.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; name = PushDemo.entitlements; path = PushDemo/PushDemo.entitlements; sourceTree = ""; }; + 62C31F6D1E556D5600AC54A4 /* RCTJPushModule.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTJPushModule.xcodeproj; path = ../../ios/RCTJPushModule/RCTJPushModule.xcodeproj; sourceTree = ""; }; 78C398B01ACF4ADC00677621 /* RCTLinking.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTLinking.xcodeproj; path = "../node_modules/react-native/Libraries/LinkingIOS/RCTLinking.xcodeproj"; sourceTree = ""; }; 832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTText.xcodeproj; path = "../node_modules/react-native/Libraries/Text/RCTText.xcodeproj"; sourceTree = ""; }; - B1925385AB2543288721BE4D /* RCTJPushModule.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = RCTJPushModule.xcodeproj; path = "../node_modules/jpush-react-native/ios/RCTJPushModule/RCTJPushModule.xcodeproj"; sourceTree = ""; }; - C813ACB0E75B40779131D220 /* libRCTJPushModule.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRCTJPushModule.a; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -244,6 +243,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 62C31F731E556D9300AC54A4 /* libRCTJPushModule.a in Frameworks */, 146834051AC3E58100842450 /* libReact.a in Frameworks */, 00C302E51ABCBA2D00DB3ED1 /* libRCTActionSheet.a in Frameworks */, 00C302E71ABCBA2D00DB3ED1 /* libRCTGeolocation.a in Frameworks */, @@ -254,7 +254,6 @@ 832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */, 00C302EA1ABCBA2D00DB3ED1 /* libRCTVibration.a in Frameworks */, 139FDEF61B0652A700C62182 /* libRCTWebSocket.a in Frameworks */, - 27193A72E28A416793C4AF78 /* libRCTJPushModule.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -368,10 +367,10 @@ name = Products; sourceTree = ""; }; - 6228AFDF1DA8BEE100862BA3 /* Products */ = { + 62C31F6E1E556D5600AC54A4 /* Products */ = { isa = PBXGroup; children = ( - 6228AFE61DA8BEE100862BA3 /* libRCTJPushModule.a */, + 62C31F721E556D5600AC54A4 /* libRCTJPushModule.a */, ); name = Products; sourceTree = ""; @@ -398,7 +397,7 @@ 832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */, 00C302DF1ABCB9EE00DB3ED1 /* RCTVibration.xcodeproj */, 139FDEE61B06529A00C62182 /* RCTWebSocket.xcodeproj */, - B1925385AB2543288721BE4D /* RCTJPushModule.xcodeproj */, + 62C31F6D1E556D5600AC54A4 /* RCTJPushModule.xcodeproj */, ); name = Libraries; sourceTree = ""; @@ -521,8 +520,8 @@ ProjectRef = 00C302BB1ABCB91800DB3ED1 /* RCTImage.xcodeproj */; }, { - ProductGroup = 6228AFDF1DA8BEE100862BA3 /* Products */; - ProjectRef = B1925385AB2543288721BE4D /* RCTJPushModule.xcodeproj */; + ProductGroup = 62C31F6E1E556D5600AC54A4 /* Products */; + ProjectRef = 62C31F6D1E556D5600AC54A4 /* RCTJPushModule.xcodeproj */; }, { ProductGroup = 78C398B11ACF4ADC00677621 /* Products */; @@ -618,13 +617,6 @@ remoteRef = 146834031AC3E56700842450 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 6228AFE61DA8BEE100862BA3 /* libRCTJPushModule.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = libRCTJPushModule.a; - remoteRef = 6228AFE51DA8BEE100862BA3 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; 623BBA481E49AC4F00186A4D /* libRCTImage-tvOS.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; @@ -716,6 +708,13 @@ remoteRef = 623BBA731E49AC4F00186A4D /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; + 62C31F721E556D5600AC54A4 /* libRCTJPushModule.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = libRCTJPushModule.a; + remoteRef = 62C31F711E556D5600AC54A4 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; 78C398B91ACF4ADC00677621 /* libRCTLinking.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; @@ -857,10 +856,10 @@ DEAD_CODE_STRIPPING = NO; DEVELOPMENT_TEAM = RL64Y54S9V; HEADER_SEARCH_PATHS = ( - "$(SRCROOT)/../node_modules/jpush-react-native/ios/RCTJPushModule/RCTJPushModule", /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, "$(SRCROOT)/../node_modules/react-native/React", "$(inherited)", + "$(SRCROOT)/../../ios/RCTJPushModule/RCTJPushModule", ); INFOPLIST_FILE = PushDemo/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; @@ -903,10 +902,10 @@ CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = RL64Y54S9V; HEADER_SEARCH_PATHS = ( - "$(SRCROOT)/../node_modules/jpush-react-native/ios/RCTJPushModule/RCTJPushModule", /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, "$(SRCROOT)/../node_modules/react-native/React", "$(inherited)", + "$(SRCROOT)/../../ios/RCTJPushModule/RCTJPushModule", ); INFOPLIST_FILE = PushDemo/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; diff --git a/example/ios/PushDemo.xcodeproj/project.pbxproj b/example/ios/PushDemo.xcodeproj/project.pbxproj index aca1d9aa..19163cb4 100644 --- a/example/ios/PushDemo.xcodeproj/project.pbxproj +++ b/example/ios/PushDemo.xcodeproj/project.pbxproj @@ -23,8 +23,8 @@ 146834051AC3E58100842450 /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 146834041AC3E56700842450 /* libReact.a */; }; 5E9157361DD0AC6A00FF2AA8 /* libRCTAnimation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5E9157331DD0AC6500FF2AA8 /* libRCTAnimation.a */; }; 832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 832341B51AAA6A8300B99B32 /* libRCTText.a */; }; - 90142A7E6D004F3FA7FD8452 /* libRCTJPushModule.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 8AADC7AA6F1F4F45B9F2123E /* libRCTJPushModule.a */; }; D2C9C9C76AD140A3A1D6AF9B /* libRCTJCoreModel.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A4A27388E86B468EA6622157 /* libRCTJCoreModel.a */; }; + 725F373B860A4BF3A4DD53A1 /* libRCTJPushModule.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 01A8113BE7A14D989491FD8A /* libRCTJPushModule.a */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -235,10 +235,10 @@ 5E91572D1DD0AC6500FF2AA8 /* RCTAnimation.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTAnimation.xcodeproj; path = "../node_modules/react-native/Libraries/NativeAnimation/RCTAnimation.xcodeproj"; sourceTree = ""; }; 78C398B01ACF4ADC00677621 /* RCTLinking.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTLinking.xcodeproj; path = "../node_modules/react-native/Libraries/LinkingIOS/RCTLinking.xcodeproj"; sourceTree = ""; }; 832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTText.xcodeproj; path = "../node_modules/react-native/Libraries/Text/RCTText.xcodeproj"; sourceTree = ""; }; - 0BA2C85D670A4AE2BF31BA56 /* RCTJPushModule.xcodeproj */ = {isa = PBXFileReference; name = "RCTJPushModule.xcodeproj"; path = "../node_modules/jpush-react-native/ios/RCTJPushModule/RCTJPushModule.xcodeproj"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = wrapper.pb-project; explicitFileType = undefined; includeInIndex = 0; }; - 8AADC7AA6F1F4F45B9F2123E /* libRCTJPushModule.a */ = {isa = PBXFileReference; name = "libRCTJPushModule.a"; path = "libRCTJPushModule.a"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = archive.ar; explicitFileType = undefined; includeInIndex = 0; }; EB38C9F7396D4021BA0E48D5 /* RCTJCoreModel.xcodeproj */ = {isa = PBXFileReference; name = "RCTJCoreModel.xcodeproj"; path = "../node_modules/testdep/ios/RCTJCoreModel/RCTJCoreModel.xcodeproj"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = wrapper.pb-project; explicitFileType = undefined; includeInIndex = 0; }; A4A27388E86B468EA6622157 /* libRCTJCoreModel.a */ = {isa = PBXFileReference; name = "libRCTJCoreModel.a"; path = "libRCTJCoreModel.a"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = archive.ar; explicitFileType = undefined; includeInIndex = 0; }; + 37F34585390D4E679C39A2D7 /* RCTJPushModule.xcodeproj */ = {isa = PBXFileReference; name = "RCTJPushModule.xcodeproj"; path = "../node_modules/jpush-react-native/ios/RCTJPushModule/RCTJPushModule.xcodeproj"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = wrapper.pb-project; explicitFileType = undefined; includeInIndex = 0; }; + 01A8113BE7A14D989491FD8A /* libRCTJPushModule.a */ = {isa = PBXFileReference; name = "libRCTJPushModule.a"; path = "libRCTJPushModule.a"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = archive.ar; explicitFileType = undefined; includeInIndex = 0; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -265,8 +265,8 @@ 832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */, 00C302EA1ABCBA2D00DB3ED1 /* libRCTVibration.a in Frameworks */, 139FDEF61B0652A700C62182 /* libRCTWebSocket.a in Frameworks */, - 90142A7E6D004F3FA7FD8452 /* libRCTJPushModule.a in Frameworks */, D2C9C9C76AD140A3A1D6AF9B /* libRCTJCoreModel.a in Frameworks */, + 725F373B860A4BF3A4DD53A1 /* libRCTJPushModule.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -411,8 +411,8 @@ 832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */, 00C302DF1ABCB9EE00DB3ED1 /* RCTVibration.xcodeproj */, 139FDEE61B06529A00C62182 /* RCTWebSocket.xcodeproj */, - 0BA2C85D670A4AE2BF31BA56 /* RCTJPushModule.xcodeproj */, EB38C9F7396D4021BA0E48D5 /* RCTJCoreModel.xcodeproj */, + 37F34585390D4E679C39A2D7 /* RCTJPushModule.xcodeproj */, ); name = Libraries; sourceTree = ""; diff --git a/ios/RCTJPushModule/RCTJPushModule.xcodeproj/project.xcworkspace/xcuserdata/HuminiOS.xcuserdatad/UserInterfaceState.xcuserstate b/ios/RCTJPushModule/RCTJPushModule.xcodeproj/project.xcworkspace/xcuserdata/HuminiOS.xcuserdatad/UserInterfaceState.xcuserstate index 18d4fc94..415cf8f2 100644 Binary files a/ios/RCTJPushModule/RCTJPushModule.xcodeproj/project.xcworkspace/xcuserdata/HuminiOS.xcuserdatad/UserInterfaceState.xcuserstate and b/ios/RCTJPushModule/RCTJPushModule.xcodeproj/project.xcworkspace/xcuserdata/HuminiOS.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/package.json b/package.json index ed7c685e..48afbd0e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "jpush-react-native", - "version": "1.4.4", + "version": "1.4.5", "description": "a jpush plugin for react native application", "main": "index.js", "scripts": { @@ -22,7 +22,7 @@ }, "homepage": "https://github.com/jpush/jpush-react-native#readme", "peerDependencies": { - "react-native": "> 0.39.0", + "react-native": ">= 0.40.0", "jcore-react-native": ">= 1.0.0" } }