Skip to content

Commit 51b1b7a

Browse files
midyanmidyan
committed
Fix all build issues
1 parent a852af2 commit 51b1b7a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+4572
-123
lines changed

‎.DS_Store

2 KB
Binary file not shown.

‎.babelrc

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"presets": ["react-native"]
3+
}

‎.buckconfig

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
2+
[android]
3+
target = Google Inc.:Google APIs:23
4+
5+
[maven_repositories]
6+
central = https://repo1.maven.org/maven2

‎.flowconfig

+47
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
[ignore]
2+
; We fork some components by platform
3+
.*/*[.]android.js
4+
5+
; Ignore "BUCK" generated dirs
6+
<PROJECT_ROOT>/\.buckd/
7+
8+
; Ignore unexpected extra "@providesModule"
9+
.*/node_modules/.*/node_modules/fbjs/.*
10+
11+
; Ignore duplicate module providers
12+
; For RN Apps installed via npm, "Libraries" folder is inside
13+
; "node_modules/react-native" but in the source repo it is in the root
14+
.*/Libraries/react-native/React.js
15+
.*/Libraries/react-native/ReactNative.js
16+
17+
[include]
18+
19+
[libs]
20+
node_modules/react-native/Libraries/react-native/react-native-interface.js
21+
node_modules/react-native/flow
22+
flow/
23+
24+
[options]
25+
emoji=true
26+
27+
module.system=haste
28+
29+
experimental.strict_type_args=true
30+
31+
munge_underscores=true
32+
33+
module.name_mapper='^[./a-zA-Z0-9$_-]+\.\(bmp\|gif\|jpg\|jpeg\|png\|psd\|svg\|webp\|m4v\|mov\|mp4\|mpeg\|mpg\|webm\|aac\|aiff\|caf\|m4a\|mp3\|wav\|html\|pdf\)$' -> 'RelativeImageStub'
34+
35+
suppress_type=$FlowIssue
36+
suppress_type=$FlowFixMe
37+
suppress_type=$FixMe
38+
39+
suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(>=0\\.\\(4[0-5]\\|[1-3][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)
40+
suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(>=0\\.\\(4[0-5]\\|[1-3][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)?:? #[0-9]+
41+
suppress_comment=\\(.\\|\n\\)*\\$FlowFixedInNextDeploy
42+
suppress_comment=\\(.\\|\n\\)*\\$FlowExpectedError
43+
44+
unsafe.enable_getters_and_setters=true
45+
46+
[version]
47+
^0.45.0

‎.gitattributes

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
*.pbxproj -text

‎.gitignore

+52-60
Original file line numberDiff line numberDiff line change
@@ -1,61 +1,53 @@
1-
# Logs
2-
logs
3-
*.log
4-
npm-debug.log*
5-
yarn-debug.log*
6-
yarn-error.log*
7-
8-
# Runtime data
9-
pids
10-
*.pid
11-
*.seed
12-
*.pid.lock
13-
14-
# Directory for instrumented libs generated by jscoverage/JSCover
15-
lib-cov
16-
17-
# Coverage directory used by tools like istanbul
18-
coverage
19-
20-
# nyc test coverage
21-
.nyc_output
22-
23-
# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
24-
.grunt
25-
26-
# Bower dependency directory (https://bower.io/)
27-
bower_components
28-
29-
# node-waf configuration
30-
.lock-wscript
31-
32-
# Compiled binary addons (http://nodejs.org/api/addons.html)
33-
build/Release
34-
35-
# Dependency directories
1+
# OSX
2+
#
3+
.DS_Store
4+
5+
# Xcode
6+
#
7+
build/
8+
*.pbxuser
9+
!default.pbxuser
10+
*.mode1v3
11+
!default.mode1v3
12+
*.mode2v3
13+
!default.mode2v3
14+
*.perspectivev3
15+
!default.perspectivev3
16+
xcuserdata
17+
*.xccheckout
18+
*.moved-aside
19+
DerivedData
20+
*.hmap
21+
*.ipa
22+
*.xcuserstate
23+
project.xcworkspace
24+
25+
# Android/IntelliJ
26+
#
27+
build/
28+
.idea
29+
.gradle
30+
local.properties
31+
*.iml
32+
33+
# node.js
34+
#
3635
node_modules/
37-
jspm_packages/
38-
android/
39-
ios/
40-
Tests/
41-
42-
# Typescript v1 declaration files
43-
typings/
44-
45-
# Optional npm cache directory
46-
.npm
47-
48-
# Optional eslint cache
49-
.eslintcache
50-
51-
# Optional REPL history
52-
.node_repl_history
53-
54-
# Output of 'npm pack'
55-
*.tgz
56-
57-
# Yarn Integrity file
58-
.yarn-integrity
59-
60-
# dotenv environment variables file
61-
.env
36+
npm-debug.log
37+
yarn-error.log
38+
39+
# BUCK
40+
buck-out/
41+
\.buckd/
42+
*.keystore
43+
44+
# fastlane
45+
#
46+
# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
47+
# screenshots whenever they are needed.
48+
# For more information about the recommended setup visit:
49+
# https://github.com/fastlane/fastlane/blob/master/fastlane/docs/Gitignore.md
50+
51+
fastlane/report.xml
52+
fastlane/Preview.html
53+
fastlane/screenshots

‎.watchmanconfig

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{}

‎README.md

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1 @@
1-
# ConnAppMobile
2-
3-
* The OpenSource, OfflineFirst, Realtime app for your Congress and Event!
1+
# Enegep2017

‎android/app/BUCK

+2-2
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,12 @@ android_library(
4545

4646
android_build_config(
4747
name = "build_config",
48-
package = "com.connappmobile",
48+
package = "com.enegep2017",
4949
)
5050

5151
android_resource(
5252
name = "res",
53-
package = "com.connappmobile",
53+
package = "com.enegep2017",
5454
res = "src/main/res",
5555
)
5656

‎android/app/build.gradle

+3-2
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ android {
9494
buildToolsVersion "23.0.1"
9595

9696
defaultConfig {
97-
applicationId "com.connappmobile"
97+
applicationId "com.enegep2017"
9898
minSdkVersion 16
9999
targetSdkVersion 22
100100
versionCode 1
@@ -133,9 +133,10 @@ android {
133133
}
134134

135135
dependencies {
136-
compile project(':react-native-i18n')
137136
compile project(':react-native-vector-icons')
137+
compile project(':react-native-i18n')
138138
compile project(':react-native-device-info')
139+
compile project(':react-native-config')
139140
compile fileTree(dir: "libs", include: ["*.jar"])
140141
compile "com.android.support:appcompat-v7:23.0.1"
141142
compile "com.facebook.react:react-native:+" // From node_modules

‎android/app/src/main/AndroidManifest.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2-
package="com.connappmobile"
2+
package="com.enegep2017"
33
android:versionCode="1"
44
android:versionName="1.0">
55

66
<uses-permission android:name="android.permission.INTERNET" />
7-
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
87
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
9-
8+
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
9+
1010
<uses-sdk
1111
android:minSdkVersion="16"
1212
android:targetSdkVersion="22" />

‎android/app/src/main/java/com/enegep2017/MainActivity.java

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
package com.enegep2017;
2+
3+
import com.facebook.react.ReactActivity;
4+
5+
public class MainActivity extends ReactActivity {
6+
7+
/**
8+
* Returns the name of the main component registered from JavaScript.
9+
* This is used to schedule rendering of the component.
10+
*/
11+
@Override
12+
protected String getMainComponentName() {
13+
return "Enegep2017";
14+
}
15+
}

‎android/app/src/main/java/com/connappmobile/MainApplication.java ‎android/app/src/main/java/com/enegep2017/MainApplication.java

+6-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1-
package com.connappmobile;
1+
package com.enegep2017;
22

33
import android.app.Application;
44

55
import com.facebook.react.ReactApplication;
6-
import com.i18n.reactnativei18n.ReactNativeI18n;
76
import com.oblador.vectoricons.VectorIconsPackage;
7+
import com.i18n.reactnativei18n.ReactNativeI18n;
88
import com.learnium.RNDeviceInfo.RNDeviceInfo;
9+
import com.lugg.ReactNativeConfig.ReactNativeConfigPackage;
910
import com.facebook.react.ReactNativeHost;
1011
import com.facebook.react.ReactPackage;
1112
import com.facebook.react.shell.MainReactPackage;
@@ -26,9 +27,10 @@ public boolean getUseDeveloperSupport() {
2627
protected List<ReactPackage> getPackages() {
2728
return Arrays.<ReactPackage>asList(
2829
new MainReactPackage(),
29-
new ReactNativeI18n(),
3030
new VectorIconsPackage(),
31-
new RNDeviceInfo()
31+
new ReactNativeI18n(),
32+
new RNDeviceInfo(),
33+
new ReactNativeConfigPackage()
3234
);
3335
}
3436
};

‎android/app/src/main/res/values/strings.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
<resources>
2-
<string name="app_name">ConnAppMobile</string>
2+
<string name="app_name">Enegep2017</string>
33
</resources>

‎android/settings.gradle

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
1-
rootProject.name = 'ConnAppMobile'
2-
include ':react-native-i18n'
3-
project(':react-native-i18n').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-i18n/android')
1+
rootProject.name = 'Enegep2017'
42
include ':react-native-vector-icons'
53
project(':react-native-vector-icons').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-vector-icons/android')
4+
include ':react-native-i18n'
5+
project(':react-native-i18n').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-i18n/android')
66
include ':react-native-device-info'
77
project(':react-native-device-info').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-device-info/android')
8+
include ':react-native-config'
9+
project(':react-native-config').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-config/android')
810

911
include ':app'

‎app.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
2-
"name": "ConnAppMobile",
3-
"displayName": "ConnAppMobile"
2+
"name": "Enegep2017",
3+
"displayName": "Enegep2017"
44
}

‎index.android.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ import './App/Config/ReactotronConfig'
22
import { AppRegistry } from 'react-native'
33
import App from './App/Containers/App'
44

5-
AppRegistry.registerComponent('ConnAppMobile', () => App)
5+
AppRegistry.registerComponent('Enegep2017', () => App)

‎index.ios.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ import './App/Config/ReactotronConfig'
22
import { AppRegistry } from 'react-native'
33
import App from './App/Containers/App'
44

5-
AppRegistry.registerComponent('ConnAppMobile', () => App)
5+
AppRegistry.registerComponent('Enegep2017', () => App)

‎ios - safe/Enegep2017-tvOS/Info.plist

+54
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
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>CFBundleDevelopmentRegion</key>
6+
<string>en</string>
7+
<key>CFBundleExecutable</key>
8+
<string>$(EXECUTABLE_NAME)</string>
9+
<key>CFBundleIdentifier</key>
10+
<string>org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier)</string>
11+
<key>CFBundleInfoDictionaryVersion</key>
12+
<string>6.0</string>
13+
<key>CFBundleName</key>
14+
<string>$(PRODUCT_NAME)</string>
15+
<key>CFBundlePackageType</key>
16+
<string>APPL</string>
17+
<key>CFBundleShortVersionString</key>
18+
<string>1.0</string>
19+
<key>CFBundleSignature</key>
20+
<string>????</string>
21+
<key>CFBundleVersion</key>
22+
<string>1</string>
23+
<key>LSRequiresIPhoneOS</key>
24+
<true/>
25+
<key>UILaunchStoryboardName</key>
26+
<string>LaunchScreen</string>
27+
<key>UIRequiredDeviceCapabilities</key>
28+
<array>
29+
<string>armv7</string>
30+
</array>
31+
<key>UISupportedInterfaceOrientations</key>
32+
<array>
33+
<string>UIInterfaceOrientationPortrait</string>
34+
<string>UIInterfaceOrientationLandscapeLeft</string>
35+
<string>UIInterfaceOrientationLandscapeRight</string>
36+
</array>
37+
<key>UIViewControllerBasedStatusBarAppearance</key>
38+
<false/>
39+
<key>NSLocationWhenInUseUsageDescription</key>
40+
<string></string>
41+
<key>NSAppTransportSecurity</key>
42+
<!--See http://ste.vn/2015/06/10/configuring-app-transport-security-ios-9-osx-10-11/ -->
43+
<dict>
44+
<key>NSExceptionDomains</key>
45+
<dict>
46+
<key>localhost</key>
47+
<dict>
48+
<key>NSExceptionAllowsInsecureHTTPLoads</key>
49+
<true/>
50+
</dict>
51+
</dict>
52+
</dict>
53+
</dict>
54+
</plist>

‎ios/ConnAppMobileTests/Info.plist ‎ios - safe/Enegep2017-tvOSTests/Info.plist

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<key>CFBundleExecutable</key>
88
<string>$(EXECUTABLE_NAME)</string>
99
<key>CFBundleIdentifier</key>
10-
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
10+
<string>org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier)</string>
1111
<key>CFBundleInfoDictionaryVersion</key>
1212
<string>6.0</string>
1313
<key>CFBundleName</key>

0 commit comments

Comments
 (0)