Skip to content

Commit 74c6ace

Browse files
NaturalclarNaturalclar
authored
update dependencies (#98)
1 parent 5cea78b commit 74c6ace

File tree

4 files changed

+269
-206
lines changed

4 files changed

+269
-206
lines changed

‎.circleci/config.yml

+10-11
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# -------------------------
22
# DEFAULTS
33
# -------------------------
4+
45
defaults: &defaults
56
working_directory: ~/react-native-segmented-control
67
environment:
@@ -12,27 +13,27 @@ linux_defaults: &linux_defaults
1213
docker:
1314
- image: circleci/node:10
1415
environment:
15-
- PATH: "/opt/yarn/yarn-v1.5.1/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
16+
- PATH: '/opt/yarn/yarn-v1.5.1/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'
1617

1718
# ANDROID
1819
android_defaults: &android_defaults
1920
<<: *defaults
2021
docker:
2122
- image: circleci/android:api-27-node8-alpha
22-
resource_class: "medium"
23+
resource_class: 'medium'
2324
environment:
24-
- TERM: "dumb"
25+
- TERM: 'dumb'
2526
- ADB_INSTALL_TIMEOUT: 10
26-
- _JAVA_OPTIONS: "-XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap"
27+
- _JAVA_OPTIONS: '-XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap'
2728
- GRADLE_OPTS: '-Dorg.gradle.daemon=false -Dorg.gradle.jvmargs="-XX:+HeapDumpOnOutOfMemoryError"'
2829
- BUILD_THREADS: 2
2930

3031
# MACOS
3132
macos_defaults: &macos_defaults
3233
<<: *defaults
33-
resource_class: "medium"
34+
resource_class: 'medium'
3435
macos:
35-
xcode: "10.1.0"
36+
xcode: '10.1.0'
3637

3738
# -------------------------
3839
# ALIASES
@@ -73,9 +74,9 @@ aliases:
7374
name: Flow Checks
7475
command: yarn flow check
7576

76-
# - &jest
77-
# name: Jest Unit Tests
78-
# command: yarn test:jest
77+
# - &jest
78+
# name: Jest Unit Tests
79+
# command: yarn test:jest
7980

8081
- &tsc
8182
name: TypeScript type check
@@ -133,7 +134,6 @@ jobs:
133134
steps:
134135
- attach_workspace:
135136
at: ~/react-native-segmented-control
136-
- restore-cache: *restore-gradle-cache
137137
- run:
138138
name: Accept Android licences
139139
command: |-
@@ -146,7 +146,6 @@ jobs:
146146
yarn install
147147
cd android
148148
./gradlew clean assembleDebug
149-
- save-cache: *save-gradle-cache
150149
151150
ios-checkout:
152151
<<: *macos_defaults

‎example/android/gradlew.bat

+100-100
Original file line numberDiff line numberDiff line change
@@ -1,100 +1,100 @@
1-
@rem
2-
@rem Copyright 2015 the original author or authors.
3-
@rem
4-
@rem Licensed under the Apache License, Version 2.0 (the "License");
5-
@rem you may not use this file except in compliance with the License.
6-
@rem You may obtain a copy of the License at
7-
@rem
8-
@rem http://www.apache.org/licenses/LICENSE-2.0
9-
@rem
10-
@rem Unless required by applicable law or agreed to in writing, software
11-
@rem distributed under the License is distributed on an "AS IS" BASIS,
12-
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13-
@rem See the License for the specific language governing permissions and
14-
@rem limitations under the License.
15-
@rem
16-
17-
@if "%DEBUG%" == "" @echo off
18-
@rem ##########################################################################
19-
@rem
20-
@rem Gradle startup script for Windows
21-
@rem
22-
@rem ##########################################################################
23-
24-
@rem Set local scope for the variables with windows NT shell
25-
if "%OS%"=="Windows_NT" setlocal
26-
27-
set DIRNAME=%~dp0
28-
if "%DIRNAME%" == "" set DIRNAME=.
29-
set APP_BASE_NAME=%~n0
30-
set APP_HOME=%DIRNAME%
31-
32-
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
33-
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
34-
35-
@rem Find java.exe
36-
if defined JAVA_HOME goto findJavaFromJavaHome
37-
38-
set JAVA_EXE=java.exe
39-
%JAVA_EXE% -version >NUL 2>&1
40-
if "%ERRORLEVEL%" == "0" goto init
41-
42-
echo.
43-
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
44-
echo.
45-
echo Please set the JAVA_HOME variable in your environment to match the
46-
echo location of your Java installation.
47-
48-
goto fail
49-
50-
:findJavaFromJavaHome
51-
set JAVA_HOME=%JAVA_HOME:"=%
52-
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
53-
54-
if exist "%JAVA_EXE%" goto init
55-
56-
echo.
57-
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
58-
echo.
59-
echo Please set the JAVA_HOME variable in your environment to match the
60-
echo location of your Java installation.
61-
62-
goto fail
63-
64-
:init
65-
@rem Get command-line arguments, handling Windows variants
66-
67-
if not "%OS%" == "Windows_NT" goto win9xME_args
68-
69-
:win9xME_args
70-
@rem Slurp the command line arguments.
71-
set CMD_LINE_ARGS=
72-
set _SKIP=2
73-
74-
:win9xME_args_slurp
75-
if "x%~1" == "x" goto execute
76-
77-
set CMD_LINE_ARGS=%*
78-
79-
:execute
80-
@rem Setup the command line
81-
82-
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
83-
84-
@rem Execute Gradle
85-
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
86-
87-
:end
88-
@rem End local scope for the variables with windows NT shell
89-
if "%ERRORLEVEL%"=="0" goto mainEnd
90-
91-
:fail
92-
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
93-
rem the _cmd.exe /c_ return code!
94-
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
95-
exit /b 1
96-
97-
:mainEnd
98-
if "%OS%"=="Windows_NT" endlocal
99-
100-
:omega
1+
@rem
2+
@rem Copyright 2015 the original author or authors.
3+
@rem
4+
@rem Licensed under the Apache License, Version 2.0 (the "License");
5+
@rem you may not use this file except in compliance with the License.
6+
@rem You may obtain a copy of the License at
7+
@rem
8+
@rem http://www.apache.org/licenses/LICENSE-2.0
9+
@rem
10+
@rem Unless required by applicable law or agreed to in writing, software
11+
@rem distributed under the License is distributed on an "AS IS" BASIS,
12+
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
@rem See the License for the specific language governing permissions and
14+
@rem limitations under the License.
15+
@rem
16+
17+
@if "%DEBUG%" == "" @echo off
18+
@rem ##########################################################################
19+
@rem
20+
@rem Gradle startup script for Windows
21+
@rem
22+
@rem ##########################################################################
23+
24+
@rem Set local scope for the variables with windows NT shell
25+
if "%OS%"=="Windows_NT" setlocal
26+
27+
set DIRNAME=%~dp0
28+
if "%DIRNAME%" == "" set DIRNAME=.
29+
set APP_BASE_NAME=%~n0
30+
set APP_HOME=%DIRNAME%
31+
32+
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
33+
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
34+
35+
@rem Find java.exe
36+
if defined JAVA_HOME goto findJavaFromJavaHome
37+
38+
set JAVA_EXE=java.exe
39+
%JAVA_EXE% -version >NUL 2>&1
40+
if "%ERRORLEVEL%" == "0" goto init
41+
42+
echo.
43+
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
44+
echo.
45+
echo Please set the JAVA_HOME variable in your environment to match the
46+
echo location of your Java installation.
47+
48+
goto fail
49+
50+
:findJavaFromJavaHome
51+
set JAVA_HOME=%JAVA_HOME:"=%
52+
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
53+
54+
if exist "%JAVA_EXE%" goto init
55+
56+
echo.
57+
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
58+
echo.
59+
echo Please set the JAVA_HOME variable in your environment to match the
60+
echo location of your Java installation.
61+
62+
goto fail
63+
64+
:init
65+
@rem Get command-line arguments, handling Windows variants
66+
67+
if not "%OS%" == "Windows_NT" goto win9xME_args
68+
69+
:win9xME_args
70+
@rem Slurp the command line arguments.
71+
set CMD_LINE_ARGS=
72+
set _SKIP=2
73+
74+
:win9xME_args_slurp
75+
if "x%~1" == "x" goto execute
76+
77+
set CMD_LINE_ARGS=%*
78+
79+
:execute
80+
@rem Setup the command line
81+
82+
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
83+
84+
@rem Execute Gradle
85+
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
86+
87+
:end
88+
@rem End local scope for the variables with windows NT shell
89+
if "%ERRORLEVEL%"=="0" goto mainEnd
90+
91+
:fail
92+
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
93+
rem the _cmd.exe /c_ return code!
94+
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
95+
exit /b 1
96+
97+
:mainEnd
98+
if "%OS%"=="Windows_NT" endlocal
99+
100+
:omega

‎package.json

+4-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
"@types/react-native": "^0.62.1",
3131
"babel-eslint": "^10.1.0",
3232
"babel-jest": "^26.0.1",
33-
"eslint": "6",
33+
"eslint": "7",
3434
"eslint-plugin-prettier": "^3.1.2",
3535
"flow-bin": "^0.113.0",
3636
"husky": "^4.0.10",
@@ -44,6 +44,9 @@
4444
"semantic-release": "^17.0.4",
4545
"typescript": "^3.8.3"
4646
},
47+
"resolutions": {
48+
"@react-native-community/cli": "4.10.0"
49+
},
4750
"jest": {
4851
"preset": "react-native",
4952
"setupFilesAfterEnv": [

0 commit comments

Comments
 (0)