Commit 01349100 authored by Wietse Kuipers's avatar Wietse Kuipers
Browse files

Monthly package update

parent d14be78a
...@@ -22,6 +22,8 @@ node_modules/react-native/flow ...@@ -22,6 +22,8 @@ node_modules/react-native/flow
flow/ flow/
[options] [options]
emoji=true
module.system=haste module.system=haste
experimental.strict_type_args=true experimental.strict_type_args=true
...@@ -34,11 +36,12 @@ suppress_type=$FlowIssue ...@@ -34,11 +36,12 @@ suppress_type=$FlowIssue
suppress_type=$FlowFixMe suppress_type=$FlowFixMe
suppress_type=$FixMe suppress_type=$FixMe
suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(>=0\\.\\(3[0-7]\\|[1-2][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\) suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(>=0\\.\\(4[0-0]\\|[1-3][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)
suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(>=0\\.\\(3[0-7]\\|1[0-9]\\|[1-2][0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)?:? #[0-9]+ suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(>=0\\.\\(4[0-0]\\|[1-3][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)?:? #[0-9]+
suppress_comment=\\(.\\|\n\\)*\\$FlowFixedInNextDeploy suppress_comment=\\(.\\|\n\\)*\\$FlowFixedInNextDeploy
suppress_comment=\\(.\\|\n\\)*\\$FlowExpectedError
unsafe.enable_getters_and_setters=true unsafe.enable_getters_and_setters=true
[version] [version]
^0.37.0 ^0.40.0
* text=auto eol=lf *.pbxproj -text
# Images should be treated as binary
*.png binary
*.jpeg binary
*.jpg binary
*.gif binary
*.ico binary
*.mo binary
# PDF is binary
*.pdf binary
# Font files
*.eot binary
*.otf binary
*.ttf binary
*.woff2 binary
*.woff binary
*.py text
*.js text
*.css text
*.html text
*.sql text
*.po text merge=binary
...@@ -39,7 +39,6 @@ yarn-error.log ...@@ -39,7 +39,6 @@ yarn-error.log
# BUCK # BUCK
buck-out/ buck-out/
\.buckd/ \.buckd/
android/app/libs
*.keystore *.keystore
# fastlane # fastlane
...@@ -52,6 +51,4 @@ android/app/libs ...@@ -52,6 +51,4 @@ android/app/libs
fastlane/report.xml fastlane/report.xml
fastlane/Preview.html fastlane/Preview.html
fastlane/screenshots fastlane/screenshots
*.bat
bundle.js bundle.js
...@@ -22,4 +22,3 @@ jest: ...@@ -22,4 +22,3 @@ jest:
script: script:
- rm -rf .yarn - rm -rf .yarn
- yarn lint - yarn lint
- yarn test
...@@ -4,9 +4,3 @@ import React from 'react'; ...@@ -4,9 +4,3 @@ import React from 'react';
import renderer from 'react-test-renderer'; import renderer from 'react-test-renderer';
import Index from '../app/app'; import Index from '../app/app';
it('renders correctly', () => {
const tree = renderer.create(
<Index />,
);
});
import 'react-native';
import React from 'react';
// Note: test renderer must be required after react-native.
import renderer from 'react-test-renderer';
import Index from '../app/app';
it('renders correctly', () => {
const tree = renderer.create(
<Index />,
);
});
import re
# To learn about Buck see [Docs](https://buckbuild.com/). # To learn about Buck see [Docs](https://buckbuild.com/).
# To run your application with Buck: # To run your application with Buck:
# - install Buck # - install Buck
...@@ -11,8 +9,9 @@ import re ...@@ -11,8 +9,9 @@ import re
# #
lib_deps = [] lib_deps = []
for jarfile in glob(['libs/*.jar']): for jarfile in glob(['libs/*.jar']):
name = 'jars__' + re.sub(r'^.*/([^/]+)\.jar$', r'\1', jarfile) name = 'jars__' + jarfile[jarfile.rindex('/') + 1: jarfile.rindex('.jar')]
lib_deps.append(':' + name) lib_deps.append(':' + name)
prebuilt_jar( prebuilt_jar(
name = name, name = name,
...@@ -20,7 +19,7 @@ for jarfile in glob(['libs/*.jar']): ...@@ -20,7 +19,7 @@ for jarfile in glob(['libs/*.jar']):
) )
for aarfile in glob(['libs/*.aar']): for aarfile in glob(['libs/*.aar']):
name = 'aars__' + re.sub(r'^.*/([^/]+)\.aar$', r'\1', aarfile) name = 'aars__' + aarfile[aarfile.rindex('/') + 1: aarfile.rindex('.aar')]
lib_deps.append(':' + name) lib_deps.append(':' + name)
android_prebuilt_aar( android_prebuilt_aar(
name = name, name = name,
...@@ -28,39 +27,39 @@ for aarfile in glob(['libs/*.aar']): ...@@ -28,39 +27,39 @@ for aarfile in glob(['libs/*.aar']):
) )
android_library( android_library(
name = 'all-libs', name = "all-libs",
exported_deps = lib_deps exported_deps = lib_deps,
) )
android_library( android_library(
name = 'app-code', name = "app-code",
srcs = glob([ srcs = glob([
'src/main/java/**/*.java', "src/main/java/**/*.java",
]), ]),
deps = [ deps = [
':all-libs', ":all-libs",
':build_config', ":build_config",
':res', ":res",
], ],
) )
android_build_config( android_build_config(
name = 'build_config', name = "build_config",
package = 'com.thaliapp', package = "com.thaliapp",
) )
android_resource( android_resource(
name = 'res', name = "res",
res = 'src/main/res', package = "com.thaliapp",
package = 'com.thaliapp', res = "src/main/res",
) )
android_binary( android_binary(
name = 'app', name = "app",
package_type = 'debug', keystore = "//android/keystores:debug",
manifest = 'src/main/AndroidManifest.xml', manifest = "src/main/AndroidManifest.xml",
keystore = '//android/keystores:debug', package_type = "debug",
deps = [ deps = [
':app-code', ":app-code",
], ],
) )
...@@ -19,7 +19,8 @@ ...@@ -19,7 +19,8 @@
<activity <activity
android:name=".MainActivity" android:name=".MainActivity"
android:label="@string/app_name" android:label="@string/app_name"
android:configChanges="keyboard|keyboardHidden|orientation|screenSize"> android:configChanges="keyboard|keyboardHidden|orientation|screenSize"
android:windowSoftInputMode="adjustResize">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" /> <category android:name="android.intent.category.LAUNCHER" />
......
package com.thaliapp; package com.thaliapp;
import android.app.Application; import android.app.Application;
import android.util.Log;
import com.facebook.react.ReactApplication; import com.facebook.react.ReactApplication;
import com.facebook.react.ReactInstanceManager;
import com.facebook.react.ReactNativeHost; import com.facebook.react.ReactNativeHost;
import com.facebook.react.ReactPackage; import com.facebook.react.ReactPackage;
import com.facebook.react.shell.MainReactPackage; import com.facebook.react.shell.MainReactPackage;
......
...@@ -5,7 +5,7 @@ buildscript { ...@@ -5,7 +5,7 @@ buildscript {
jcenter() jcenter()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:1.3.1' classpath 'com.android.tools.build:gradle:2.2.3'
// NOTE: Do not place your application dependencies here; they belong // NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files // in the individual module build.gradle files
......
...@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME ...@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.4-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
@if "%DEBUG%" == "" @echo off
@rem ##########################################################################
@rem
@rem Gradle startup script for Windows
@rem
@rem ##########################################################################
@rem Set local scope for the variables with windows NT shell
if "%OS%"=="Windows_NT" setlocal
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
set DEFAULT_JVM_OPTS=
set DIRNAME=%~dp0
if "%DIRNAME%" == "" set DIRNAME=.
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%
@rem Find java.exe
if defined JAVA_HOME goto findJavaFromJavaHome
set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
if "%ERRORLEVEL%" == "0" goto init
echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
goto fail
:findJavaFromJavaHome
set JAVA_HOME=%JAVA_HOME:"=%
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
if exist "%JAVA_EXE%" goto init
echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
goto fail
:init
@rem Get command-line arguments, handling Windowz variants
if not "%OS%" == "Windows_NT" goto win9xME_args
if "%@eval[2+2]" == "4" goto 4NT_args
:win9xME_args
@rem Slurp the command line arguments.
set CMD_LINE_ARGS=
set _SKIP=2
:win9xME_args_slurp
if "x%~1" == "x" goto execute
set CMD_LINE_ARGS=%*
goto execute
:4NT_args
@rem Get arguments from the 4NT Shell from JP Software
set CMD_LINE_ARGS=%$
:execute
@rem Setup the command line
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
@rem Execute Gradle
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
:end
@rem End local scope for the variables with windows NT shell
if "%ERRORLEVEL%"=="0" goto mainEnd
:fail
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
rem the _cmd.exe /c_ return code!
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
exit /b 1
:mainEnd
if "%OS%"=="Windows_NT" endlocal
:omega
keystore( keystore(
name = 'debug', name = "debug",
store = 'debug.keystore', properties = "debug.keystore.properties",
properties = 'debug.keystore.properties', store = "debug.keystore",
visibility = [ visibility = [
'PUBLIC', "PUBLIC",
], ],
) )
{
"name": "ThaliApp",
"displayName": "ThaliApp"
}
\ No newline at end of file
import React, { Component } from 'react'; import React, { Component } from 'react';
import { View, TextInput, Button, Text } from 'react-native'; import { View, TextInput, Button, Text } from 'react-native';
import { connect } from 'react-redux'; import { connect } from 'react-redux';
import PropTypes from 'prop-types';
import * as actions from '../actions/login'; import * as actions from '../actions/login';
...@@ -47,8 +48,8 @@ class Login extends Component { ...@@ -47,8 +48,8 @@ class Login extends Component {
} }
Login.propTypes = { Login.propTypes = {
loginState: React.PropTypes.string.isRequired, loginState: PropTypes.string.isRequired,
login: React.PropTypes.func.isRequired, login: PropTypes.func.isRequired,
}; };
const mapStateToProps = state => state.login; const mapStateToProps = state => state.login;
......
import React from 'react'; import React from 'react';
import { Text, View } from 'react-native'; import { Text, View } from 'react-native';
import { connect } from 'react-redux'; import { connect } from 'react-redux';
import PropTypes from 'prop-types';
import styles from '../style'; import styles from '../style';
import * as actions from '../actions/navigation'; import * as actions from '../actions/navigation';
...@@ -16,7 +17,7 @@ const Sidebar = props => ...@@ -16,7 +17,7 @@ const Sidebar = props =>
; ;
Sidebar.propTypes = { Sidebar.propTypes = {
navigate: React.PropTypes.func.isRequired, navigate: PropTypes.func.isRequired,
}; };
const mapDispatchToProps = dispatch => ({ const mapDispatchToProps = dispatch => ({
......
import React from 'react'; import React from 'react';
import { View, Text, Button } from 'react-native'; import { View, Text, Button } from 'react-native';
import { connect } from 'react-redux'; import { connect } from 'react-redux';
import PropTypes from 'prop-types';
import { logout } from '../actions/login'; import { logout } from '../actions/login';
const Welcome = props => const Welcome = props =>
...@@ -10,7 +11,7 @@ const Welcome = props => ...@@ -10,7 +11,7 @@ const Welcome = props =>
</View>; </View>;
Welcome.propTypes = { Welcome.propTypes = {
logout: React.PropTypes.func.isRequired, logout: PropTypes.func.isRequired,
}; };
const mapDispatchToProps = dispatch => ({ const mapDispatchToProps = dispatch => ({
......
import React from 'react'; import React from 'react';
import { connect } from 'react-redux'; import { connect } from 'react-redux';
import Drawer from 'react-native-drawer'; import Drawer from 'react-native-drawer';
import PropTypes from 'prop-types';
import Login from './Login'; import Login from './Login';
import Welcome from './Welcome'; import Welcome from './Welcome';
import Sidebar from './Sidebar'; import Sidebar from './Sidebar';
...@@ -52,10 +53,10 @@ const ReduxNavigator = (props) => { ...@@ -52,10 +53,10 @@ const ReduxNavigator = (props) => {
}; };
ReduxNavigator.propTypes = { ReduxNavigator.propTypes = {
currentScene: React.PropTypes.string.isRequired, currentScene: PropTypes.string.isRequired,
loggedIn: React.PropTypes.bool.isRequired, loggedIn: PropTypes.bool.isRequired,
drawerOpen: React.PropTypes.bool.isRequired, drawerOpen: PropTypes.bool.isRequired,
updateDrawer: React.PropTypes.func.isRequired, updateDrawer: PropTypes.func.isRequired,
}; };
export default connect(mapStateToProps, mapDispatchToProps)(ReduxNavigator); export default connect(mapStateToProps, mapDispatchToProps)(ReduxNavigator);
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key>
<string>org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier)</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>$(PRODUCT_NAME)</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>1</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>UILaunchStoryboardName</key>
<string>LaunchScreen</string>
<key>UIRequiredDeviceCapabilities</key>
<array>
<string>armv7</string>
</array>
<key>UISupportedInterfaceOrientations</key>
<array>
<string>UIInterfaceOrientationPortrait</string>
<string>UIInterfaceOrientationLandscapeLeft</string>
<string>UIInterfaceOrientationLandscapeRight</string>
</array>
<key>UIViewControllerBasedStatusBarAppearance</key>
<false/>
<key>NSLocationWhenInUseUsageDescription</key>
<string></string>
<key>NSAppTransportSecurity</key>
<!--See http://ste.vn/2015/06/10/configuring-app-transport-security-ios-9-osx-10-11/ -->
<dict>
<key>NSExceptionDomains</key>
<dict>
<key>localhost</key>
<dict>
<key>NSExceptionAllowsInsecureHTTPLoads</key>
<true/>
</dict>
</dict>
</dict>
</dict>
</plist>
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment