Skip to content

Commit

Permalink
MEP v1.0.14
Browse files Browse the repository at this point in the history
MEP v1.0.14
  • Loading branch information
Minishlink authored Nov 27, 2017
2 parents 9e96e15 + 86fb410 commit e24ebb2
Show file tree
Hide file tree
Showing 113 changed files with 7,637 additions and 1,227 deletions.
3 changes: 2 additions & 1 deletion .babelrc
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{
"presets": ["react-native", "react-native-stage-0/decorator-support"]
"presets": ["react-native", "react-native-stage-0/decorator-support"],
"plugins": ["lodash"]
}
1 change: 1 addition & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@
**/android
**/ios
**/vendors
dist
22 changes: 16 additions & 6 deletions .flowconfig
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,20 @@
; For RN Apps installed via npm, "Libraries" folder is inside
; "node_modules/react-native" but in the source repo it is in the root
.*/Libraries/react-native/React.js
.*/Libraries/react-native/ReactNative.js

; Ignore polyfills
.*/Libraries/polyfills/.*

; Ignore deps errors
.*/node_modules/react-navigation
.*/node_modules/@yfuks/react-native-action-sheet
.*/node_modules/react-native-firebase
.*/node_modules/react-native-linear-gradient
.*/node_modules/react-native-tab-view
.*/node_modules/react-navigation
.*/node_modules/redux-saga-test-plan
.*/node_modules/react-native-web-lists
.*/node_modules/babel-plugin-transform-react-remove-prop-types
.*/node_modules/redux-persist

; tests
.*/*.tests.js
Expand All @@ -27,7 +35,7 @@

[libs]
node_modules/react-native/Libraries/react-native/react-native-interface.js
node_modules/react-native/flow
node_modules/react-native/flow/
flow/

[options]
Expand All @@ -41,10 +49,12 @@ module.name_mapper='^[./a-zA-Z0-9$_-]+\.\(bmp\|gif\|jpg\|jpeg\|png\|psd\|svg\|we

suppress_type=$FlowIssue
suppress_type=$FlowFixMe
suppress_type=$FlowFixMeProps
suppress_type=$FlowFixMeState
suppress_type=$FixMe

suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(>=0\\.\\(4[0-9]\\|[1-3][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)
suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(>=0\\.\\(4[0-9]\\|[1-3][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)?:? #[0-9]+
suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(>=0\\.\\(5[0-6]\\|[1-4][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)
suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(>=0\\.\\(5[0-6]\\|[1-4][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)?:? #[0-9]+
suppress_comment=\\(.\\|\n\\)*\\$FlowFixedInNextDeploy
suppress_comment=\\(.\\|\n\\)*\\$FlowExpectedError

Expand All @@ -53,4 +63,4 @@ unsafe.enable_getters_and_setters=true
esproposal.decorators=ignore

[version]
^0.49.1
^0.56.0
4 changes: 1 addition & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -46,15 +46,13 @@ android/app/libs
# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
# screenshots whenever they are needed.
# For more information about the recommended setup visit:
# https://github.com/fastlane/fastlane/blob/master/fastlane/docs/Gitignore.md
# https://docs.fastlane.tools/best-practices/source-control/

fastlane/report.xml
fastlane/Preview.html
fastlane/screenshots

# Fastlane
dist
fastlane/report.xml
fastlane/.env.*.secret
*.back

Expand Down
5 changes: 5 additions & 0 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"printWidth": 120,
"singleQuote": true,
"trailingComma": "es5"
}
26 changes: 13 additions & 13 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ GEM
faraday_middleware (0.12.2)
faraday (>= 0.7.4, < 1.0)
fastimage (2.1.0)
fastlane (2.56.0)
fastlane (2.66.2)
CFPropertyList (>= 2.3, < 3.0.0)
addressable (>= 2.3, < 3.0.0)
babosa (>= 1.0.2, < 2.0.0)
Expand Down Expand Up @@ -52,9 +52,9 @@ GEM
slack-notifier (>= 1.3, < 2.0.0)
terminal-notifier (>= 1.6.2, < 2.0.0)
terminal-table (>= 1.4.5, < 2.0.0)
tty-screen (~> 0.5.0)
tty-screen (~> 0.6.2)
word_wrap (~> 1.0.0)
xcodeproj (>= 1.5.0, < 2.0.0)
xcodeproj (>= 1.5.2, < 2.0.0)
xcpretty (>= 0.2.4, < 1.0.0)
xcpretty-travis-formatter (>= 0.0.3)
gh_inspector (1.0.3)
Expand All @@ -65,20 +65,20 @@ GEM
mime-types (~> 3.0)
representable (~> 3.0)
retriable (>= 2.0, < 4.0)
googleauth (0.5.3)
googleauth (0.6.2)
faraday (~> 0.12)
jwt (~> 1.4)
jwt (>= 1.4, < 3.0)
logging (~> 2.0)
memoist (~> 0.12)
multi_json (~> 1.11)
os (~> 0.9)
signet (~> 0.7)
highline (1.7.8)
highline (1.7.10)
http-cookie (1.0.3)
domain_name (~> 0.5)
httpclient (2.8.3)
json (2.1.0)
jwt (1.5.6)
jwt (2.1.0)
little-plugger (1.1.4)
logging (2.2.2)
little-plugger (~> 1.1)
Expand All @@ -103,30 +103,30 @@ GEM
rouge (2.0.7)
rubyzip (1.2.1)
security (0.1.3)
signet (0.7.3)
signet (0.8.1)
addressable (~> 2.3)
faraday (~> 0.9)
jwt (~> 1.5)
jwt (>= 1.5, < 3.0)
multi_json (~> 1.10)
slack-notifier (1.5.1)
terminal-notifier (1.8.0)
terminal-table (1.8.0)
unicode-display_width (~> 1.1, >= 1.1.1)
tty-screen (0.5.0)
tty-screen (0.6.3)
uber (0.1.0)
unf (0.1.4)
unf_ext
unf_ext (0.0.7.4)
unicode-display_width (1.3.0)
word_wrap (1.0.0)
xcodeproj (1.5.1)
xcodeproj (1.5.3)
CFPropertyList (~> 2.3.3)
claide (>= 1.0.2, < 2.0)
colored2 (~> 3.1)
nanaimo (~> 0.2.3)
xcpretty (0.2.8)
rouge (~> 2.0.7)
xcpretty-travis-formatter (0.0.4)
xcpretty-travis-formatter (1.0.0)
xcpretty (~> 0.2, >= 0.0.7)

PLATFORMS
Expand All @@ -136,4 +136,4 @@ DEPENDENCIES
fastlane

BUNDLED WITH
1.15.2
1.16.0
5 changes: 5 additions & 0 deletions __mocks__/react-native-code-push.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
jest.mock('react-native-code-push', () => {
const CodePush = () => RootComponent => RootComponent;
CodePush.getUpdateMetadata = () => Promise.resolve();
return CodePush;
});
3 changes: 3 additions & 0 deletions __mocks__/react-native-firebase.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
jest.mock('react-native-firebase', () => ({
initializeApp: () => null,
}));
5 changes: 5 additions & 0 deletions __mocks__/react-native-safari-view.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
jest.mock('react-native-safari-view', () => ({
dismiss: () => null,
show: () => null,
isAvailable: Promise.resolve,
}));
6 changes: 5 additions & 1 deletion android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import com.android.build.OutputFile
* bundleAssetName: "index.android.bundle",
*
* // the entry file for bundle generation
* entryFile: "index.android.js",
* entryFile: "index.js",
*
* // whether to bundle JS and assets in debug mode
* bundleInDebug: false,
Expand Down Expand Up @@ -72,6 +72,10 @@ import com.android.build.OutputFile
* ]
*/

project.ext.react = [
entryFile: "index.js"
]

apply from: "../../node_modules/react-native/react.gradle"
apply from: "../../node_modules/react-native-code-push/android/codepush.gradle"

Expand Down
Binary file added android/app/src/main/assets/fonts/Feather.ttf
Binary file not shown.
Binary file modified android/app/src/main/assets/fonts/Octicons.ttf
Binary file not shown.
2 changes: 1 addition & 1 deletion android/app/src/main/java/com/dailyscrum/MainActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import android.os.Bundle;
import com.facebook.react.ReactActivity;
import com.cboy.rn.splashscreen.SplashScreen;
import org.devio.rn.splashscreen.SplashScreen;

public class MainActivity extends ReactActivity {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import com.oblador.vectoricons.VectorIconsPackage;
import com.facebook.react.ReactApplication;
import com.BV.LinearGradient.LinearGradientPackage;
import com.cboy.rn.splashscreen.SplashScreenReactPackage;
import org.devio.rn.splashscreen.SplashScreenReactPackage;
import com.microsoft.codepush.react.CodePush;
import com.airbnb.android.react.lottie.LottiePackage;
import com.horcrux.svg.SvgPackage;
Expand Down Expand Up @@ -52,6 +52,11 @@ protected List<ReactPackage> getPackages() {
new VectorIconsPackage()
);
}

@Override
protected String getJSMainModuleName() {
return "index";
}
};

@Override
Expand Down
4 changes: 2 additions & 2 deletions android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ allprojects {
}

ext {
compileSdkVersion = 25
buildToolsVersion = '25.0.2'
compileSdkVersion = 26
buildToolsVersion = '26.0.2'
}

subprojects { subproject ->
Expand Down
2 changes: 1 addition & 1 deletion android/settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ project(':react-native-splash-screen').projectDir = new File(rootProject.project
include ':react-native-code-push'
project(':react-native-code-push').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-code-push/android/app')
include ':lottie-react-native'
project(':lottie-react-native').projectDir = new File(rootProject.projectDir, '../node_modules/lottie-react-native/lib/android')
project(':lottie-react-native').projectDir = new File(rootProject.projectDir, '../node_modules/lottie-react-native/src/android')
include ':react-native-svg'
project(':react-native-svg').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-svg/android')
include ':@yfuks/react-native-action-sheet'
Expand Down
2 changes: 2 additions & 0 deletions circle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ jobs:
docker:
- image: reactcommunity/node-ci:8.4.0-0
working_directory: ~/DailyScrum
environment:
TZ: "/usr/share/zoneinfo/Europe/Paris"
steps:
- checkout
- restore_cache:
Expand Down
1 change: 1 addition & 0 deletions environment/index.dist.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@ module.exports = {
SCRUMBLE_API_URL: 'https://api.scrumble.io/v1',
TRELLO_API_URL: 'https://trello.com/1',
TRELLO_APP_KEY: '',
GA_ID: '',
isManualCodePushEnabled: false,
};
4 changes: 2 additions & 2 deletions fastlane/.env
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
APP_VERSION_CODE='11'
APP_VERSION_NAME='1.0.11'
APP_VERSION_CODE='14'
APP_VERSION_NAME='1.0.14'
2 changes: 1 addition & 1 deletion fastlane/.env.prod
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ MATCH_TYPE='appstore'
### IOS GYM ###
GYM_SCHEME='DailyScrum'
GYM_OUTPUT_DIRECTORY='dist'
GYM_OUTPUT_NAME='app.ipa'
GYM_OUTPUT_NAME='app'

### ANDROID PROJECT ###
ANDROID_PROJECT_DIR='android'
Expand Down
2 changes: 1 addition & 1 deletion fastlane/.env.staging
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ MATCH_FORCE_ENTERPRISE='1'
### IOS GYM ###
GYM_SCHEME='DailyScrum'
GYM_OUTPUT_DIRECTORY='dist'
GYM_OUTPUT_NAME='app.ipa'
GYM_OUTPUT_NAME='app'

### IOS HOCKEY APP ###
IOS_IPA_PATH='./dist/app.ipa'
Expand Down
21 changes: 19 additions & 2 deletions fastlane/Fastfile
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,10 @@ platform :ios do
plist_full_path = "#{ENV['IOS_PROJECT_PATH']}/#{ENV['IOS_PLIST_PATH']}"
set_js_env
xcodeproj = "#{ENV['IOS_PROJECT_PATH']}/#{ENV['IOS_PROJECT_NAME']}.xcodeproj"
pbxproj_full_path = "#{xcodeproj}/project.pbxproj"
xcworkspace = "#{ENV['IOS_PROJECT_PATH']}/#{ENV['IOS_PROJECT_NAME']}.xcworkspace"
backup_file(path: plist_full_path)
backup_file(path: xcodeproj)
backup_file(path: pbxproj_full_path)
update_info_plist(
xcodeproj: xcodeproj,
plist_path: ENV['IOS_PLIST_PATH'],
Expand Down Expand Up @@ -93,7 +94,7 @@ platform :ios do
)
gym(gymOptions)
restore_file(path: plist_full_path)
restore_file(path: xcodeproj)
restore_file(path: pbxproj_full_path)
end

lane :deploy_hockey do |options|
Expand Down Expand Up @@ -142,3 +143,19 @@ platform :android do
end
end
end

# WEB

platform :web do
lane :build do |options|
set_js_env
sh "yarn init:web"
sh "yarn build:web"
sh "yarn stop:web"
end

lane :deploy do |options|
build
sh "yarn gh-pages -d dist/web"
end
end
20 changes: 17 additions & 3 deletions fastlane/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ xcode-select --install

<table width="100%" >
<tr>
<th width="33%"><a href="http://brew.sh">Homebrew</a></td>
<th width="33%">Installer Script</td>
<th width="33%">Rubygems</td>
<th width="33%"><a href="http://brew.sh">Homebrew</a></th>
<th width="33%">Installer Script</th>
<th width="33%">RubyGems</th>
</tr>
<tr>
<td width="33%" align="center">macOS</td>
Expand Down Expand Up @@ -88,6 +88,20 @@ fastlane android deploy
```


----

## web
### web build
```
fastlane web build
```

### web deploy
```
fastlane web deploy
```


----

This README.md is auto-generated and will be re-generated every time [fastlane](https://fastlane.tools) is run.
Expand Down
3 changes: 3 additions & 0 deletions flow/react-native-action-sheet.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
declare module '@yfuks/react-native-action-sheet' {
declare module.exports: *;
}
3 changes: 3 additions & 0 deletions flow/react-native-tab-view.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
declare module 'react-native-tab-view' {
declare module.exports: *;
}
3 changes: 3 additions & 0 deletions flow/redux-persist.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
declare module 'redux-persist' {
declare module.exports: *;
}
4 changes: 0 additions & 4 deletions index.ios.js

This file was deleted.

File renamed without changes.
Loading

0 comments on commit e24ebb2

Please sign in to comment.