Skip to content

Commit b6d0b7e

Browse files
chasehollandoblador
chaseholland
authored and
oblador
committed
Replace iOS Shimmer submodule with a cocoapods dependency on Shimmer (oblador#18)
* updating dependencies and replacing ios shimmer submodule with a cocoapods dependency fixing gitignore and ios sample app * removing uneeded variable in podspec; reverting package.json update which pointed to local package json instead of latest published version
1 parent d36b880 commit b6d0b7e

File tree

14 files changed

+264
-1132
lines changed

14 files changed

+264
-1132
lines changed

‎.gitignore

+4
Original file line numberDiff line numberDiff line change
@@ -29,3 +29,7 @@ DerivedData
2929
*.ipa
3030
*.xcuserstate
3131
project.xcworkspace
32+
Pods
33+
34+
package-lock.json
35+
yarn.lock

‎.gitmodules

-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +0,0 @@
1-
[submodule "ios/Shimmer"]
2-
path = ios/Shimmer
3-
url = https://github.com/facebook/Shimmer.git

‎Example/.gitignore

+3
Original file line numberDiff line numberDiff line change
@@ -54,3 +54,6 @@ buck-out/
5454

5555
# Bundle artifact
5656
*.jsbundle
57+
58+
package-lock.json
59+
yarn.lock

‎Example/ios/Example.xcodeproj/project.pbxproj

+71-1,086
Large diffs are not rendered by default.

‎Example/ios/Example.xcodeproj/xcshareddata/xcschemes/Example.xcscheme

-14
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,6 @@
66
parallelizeBuildables = "NO"
77
buildImplicitDependencies = "YES">
88
<BuildActionEntries>
9-
<BuildActionEntry
10-
buildForTesting = "YES"
11-
buildForRunning = "YES"
12-
buildForProfiling = "YES"
13-
buildForArchiving = "YES"
14-
buildForAnalyzing = "YES">
15-
<BuildableReference
16-
BuildableIdentifier = "primary"
17-
BlueprintIdentifier = "83CBBA2D1A601D0E00E9B192"
18-
BuildableName = "libReact.a"
19-
BlueprintName = "React"
20-
ReferencedContainer = "container:../node_modules/react-native/React/React.xcodeproj">
21-
</BuildableReference>
22-
</BuildActionEntry>
239
<BuildActionEntry
2410
buildForTesting = "YES"
2511
buildForRunning = "YES"

‎Example/ios/Example.xcworkspace/contents.xcworkspacedata

+10
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Example/ios/Example.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>IDEDidComputeMac32BitWarning</key>
6+
<true/>
7+
</dict>
8+
</plist>

‎Example/ios/Example/Info.plist

+13-16
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,19 @@
2424
<string>1</string>
2525
<key>LSRequiresIPhoneOS</key>
2626
<true/>
27+
<key>NSAppTransportSecurity</key>
28+
<dict>
29+
<key>NSAllowsArbitraryLoads</key>
30+
<true/>
31+
<key>NSExceptionDomains</key>
32+
<dict>
33+
<key>localhost</key>
34+
<dict>
35+
<key>NSExceptionAllowsInsecureHTTPLoads</key>
36+
<true/>
37+
</dict>
38+
</dict>
39+
</dict>
2740
<key>NSLocationWhenInUseUsageDescription</key>
2841
<string></string>
2942
<key>UILaunchStoryboardName</key>
@@ -40,21 +53,5 @@
4053
</array>
4154
<key>UIViewControllerBasedStatusBarAppearance</key>
4255
<false/>
43-
<key>NSLocationWhenInUseUsageDescription</key>
44-
<string></string>
45-
<key>NSAppTransportSecurity</key>
46-
<!--See http://ste.vn/2015/06/10/configuring-app-transport-security-ios-9-osx-10-11/ -->
47-
<dict>
48-
<key>NSAllowsArbitraryLoads</key>
49-
<true/>
50-
<key>NSExceptionDomains</key>
51-
<dict>
52-
<key>localhost</key>
53-
<dict>
54-
<key>NSExceptionAllowsInsecureHTTPLoads</key>
55-
<true/>
56-
</dict>
57-
</dict>
58-
</dict>
5956
</dict>
6057
</plist>

‎Example/ios/Podfile

+38
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
# Uncomment the next line to define a global platform for your project
2+
platform :ios, '9.0'
3+
4+
target 'Example' do
5+
# Uncomment the next line if you're using Swift or would like to use dynamic frameworks
6+
# use_frameworks!
7+
8+
# Pods for Example
9+
pod 'react-native-shimmer', :path => '../../react-native-shimmer.podspec'
10+
11+
pod 'React', :path => './../node_modules/react-native', :subspecs => [
12+
'Core',
13+
'CxxBridge', # Include this for RN >= 0.47
14+
'DevSupport', # Include this to enable In-App Devmenu if RN >= 0.43
15+
'RCTText',
16+
'RCTActionSheet',
17+
'RCTNetwork',
18+
'RCTWebSocket', # Needed for debugging
19+
'RCTAnimation', # Needed for FlatList and animations running on native UI thread
20+
'RCTImage',
21+
'RCTSettings'
22+
# Add any other subspecs you want to use in your project
23+
]
24+
25+
# Explicitly include Yoga if you are using RN >= 0.42.0
26+
pod 'yoga', :path => '../node_modules/react-native/ReactCommon/yoga'
27+
28+
# Third party deps podspec link
29+
pod 'DoubleConversion', :podspec => '../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec'
30+
pod 'glog', :podspec => '../node_modules/react-native/third-party-podspecs/glog.podspec'
31+
pod 'Folly', :podspec => '../node_modules/react-native/third-party-podspecs/Folly.podspec'
32+
33+
target 'ExampleTests' do
34+
inherit! :search_paths
35+
# Pods for testing
36+
end
37+
38+
end

‎Example/ios/Podfile.lock

+104
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,104 @@
1+
PODS:
2+
- boost-for-react-native (1.63.0)
3+
- DoubleConversion (1.1.6)
4+
- Folly (2016.10.31.00):
5+
- boost-for-react-native
6+
- DoubleConversion
7+
- glog
8+
- glog (0.3.5)
9+
- React (0.57.1):
10+
- React/Core (= 0.57.1)
11+
- react-native-shimmer (0.3.2):
12+
- React (>= 0.45.1)
13+
- Shimmer (~> 1)
14+
- React/Core (0.57.1):
15+
- yoga (= 0.57.1.React)
16+
- React/CxxBridge (0.57.1):
17+
- Folly (= 2016.10.31.00)
18+
- React/Core
19+
- React/cxxreact
20+
- React/cxxreact (0.57.1):
21+
- boost-for-react-native (= 1.63.0)
22+
- Folly (= 2016.10.31.00)
23+
- React/jschelpers
24+
- React/jsinspector
25+
- React/DevSupport (0.57.1):
26+
- React/Core
27+
- React/RCTWebSocket
28+
- React/fishhook (0.57.1)
29+
- React/jschelpers (0.57.1):
30+
- Folly (= 2016.10.31.00)
31+
- React/PrivateDatabase
32+
- React/jsinspector (0.57.1)
33+
- React/PrivateDatabase (0.57.1)
34+
- React/RCTActionSheet (0.57.1):
35+
- React/Core
36+
- React/RCTAnimation (0.57.1):
37+
- React/Core
38+
- React/RCTBlob (0.57.1):
39+
- React/Core
40+
- React/RCTImage (0.57.1):
41+
- React/Core
42+
- React/RCTNetwork
43+
- React/RCTNetwork (0.57.1):
44+
- React/Core
45+
- React/RCTSettings (0.57.1):
46+
- React/Core
47+
- React/RCTText (0.57.1):
48+
- React/Core
49+
- React/RCTWebSocket (0.57.1):
50+
- React/Core
51+
- React/fishhook
52+
- React/RCTBlob
53+
- Shimmer (1.0.2)
54+
- yoga (0.57.1.React)
55+
56+
DEPENDENCIES:
57+
- DoubleConversion (from `../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec`)
58+
- Folly (from `../node_modules/react-native/third-party-podspecs/Folly.podspec`)
59+
- glog (from `../node_modules/react-native/third-party-podspecs/glog.podspec`)
60+
- react-native-shimmer (from `../../react-native-shimmer.podspec`)
61+
- React/Core (from `./../node_modules/react-native`)
62+
- React/CxxBridge (from `./../node_modules/react-native`)
63+
- React/DevSupport (from `./../node_modules/react-native`)
64+
- React/RCTActionSheet (from `./../node_modules/react-native`)
65+
- React/RCTAnimation (from `./../node_modules/react-native`)
66+
- React/RCTImage (from `./../node_modules/react-native`)
67+
- React/RCTNetwork (from `./../node_modules/react-native`)
68+
- React/RCTSettings (from `./../node_modules/react-native`)
69+
- React/RCTText (from `./../node_modules/react-native`)
70+
- React/RCTWebSocket (from `./../node_modules/react-native`)
71+
- yoga (from `../node_modules/react-native/ReactCommon/yoga`)
72+
73+
SPEC REPOS:
74+
https://github.com/cocoapods/specs.git:
75+
- boost-for-react-native
76+
- Shimmer
77+
78+
EXTERNAL SOURCES:
79+
DoubleConversion:
80+
:podspec: "../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec"
81+
Folly:
82+
:podspec: "../node_modules/react-native/third-party-podspecs/Folly.podspec"
83+
glog:
84+
:podspec: "../node_modules/react-native/third-party-podspecs/glog.podspec"
85+
React:
86+
:path: "./../node_modules/react-native"
87+
react-native-shimmer:
88+
:path: "../../react-native-shimmer.podspec"
89+
yoga:
90+
:path: "../node_modules/react-native/ReactCommon/yoga"
91+
92+
SPEC CHECKSUMS:
93+
boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c
94+
DoubleConversion: bb338842f62ab1d708ceb63ec3d999f0f3d98ecd
95+
Folly: c89ac2d5c6ab169cd7397ef27485c44f35f742c7
96+
glog: e8acf0ebbf99759d3ff18c86c292a5898282dcde
97+
React: 1fe0eb13d90b625d94c3b117c274dcfd2e760e11
98+
react-native-shimmer: 037bebac572a59889f59fc70447c5b948da23566
99+
Shimmer: c5374be1c2b0c9e292fb05b339a513cf291cac86
100+
yoga: b1ce48b6cf950b98deae82838f5173ea7cf89e85
101+
102+
PODFILE CHECKSUM: d325383b623f56dd24147c217fcb6a59d1981eec
103+
104+
COCOAPODS: 1.5.3

‎Example/package.json

+5-10
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,17 @@
33
"version": "0.0.1",
44
"private": true,
55
"scripts": {
6-
"start": "node node_modules/react-native/local-cli/cli.js start",
7-
"test": "jest"
6+
"start": "node node_modules/react-native/local-cli/cli.js start"
87
},
98
"dependencies": {
109
"react": "16.5.0",
1110
"react-native": "0.57.1",
1211
"react-native-shimmer": "*"
1312
},
1413
"devDependencies": {
15-
"@babel/runtime": "^7.1.2",
16-
"babel-jest": "23.6.0",
17-
"jest": "23.6.0",
18-
"metro-react-native-babel-preset": "0.47.1",
19-
"react-test-renderer": "16.5.0"
20-
},
21-
"jest": {
22-
"preset": "react-native"
14+
"@babel/core": "^7.0.0-0",
15+
"@babel/runtime": "^7.0.0",
16+
"babel-core": "^7.0.0-bridge.0",
17+
"metro-react-native-babel-preset": "0.47.1"
2318
}
2419
}

‎ios/Shimmer

-1
This file was deleted.

‎package.json

+4
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,10 @@
3939
"eslint": "^2.9.0",
4040
"eslint-plugin-react": "^5.0.1"
4141
},
42+
"peerDependencies": {
43+
"react": ">=16.0.0-alpha.12 <17.0.0",
44+
"react-native": ">=0.45.1 <1.0.0"
45+
},
4246
"dependencies": {
4347
"prop-types": "^15.6.0"
4448
}

‎react-native-shimmer.podspec

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
require 'json'
2-
version = JSON.parse(File.read('package.json'))["version"]
2+
package = JSON.parse(File.read('package.json'))
3+
version = package["version"]
34

45
Pod::Spec.new do |s|
56

@@ -15,5 +16,6 @@ Pod::Spec.new do |s|
1516
s.requires_arc = true
1617
s.platform = :ios, "9.0"
1718

18-
s.dependency 'React'
19+
s.dependency 'React', '>= 0.45.1'
20+
s.dependency 'Shimmer', '~> 1'
1921
end

0 commit comments

Comments
 (0)