Skip to content

Commit c4c4023

Browse files
connectdotzconnectdotz
authored
Merge pull request #55 from connectdotz/update-ci-readme
- fix ci - fix ReactToolbar
2 parents ac4ec9d + cbcce4d commit c4c4023

File tree

16 files changed

+119
-29
lines changed

16 files changed

+119
-29
lines changed

‎.circleci/config.yml

+17-17
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,20 @@ defaults: &defaults
1010
linux_defaults: &linux_defaults
1111
<<: *defaults
1212
docker:
13-
- image: circleci/node:8
13+
- image: circleci/node:12
1414
environment:
1515
- PATH: "/opt/yarn/yarn-v1.5.1/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
1616

1717
# ANDROID
1818
android_defaults: &android_defaults
1919
<<: *defaults
2020
docker:
21-
- image: circleci/android:api-27-node8-alpha
21+
- image: circleci/android:api-29-node
2222
resource_class: "medium"
2323
environment:
2424
- TERM: "dumb"
2525
- ADB_INSTALL_TIMEOUT: 10
26-
- _JAVA_OPTIONS: "-XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap"
26+
- _JAVA_OPTIONS: "-XX:+UnlockExperimentalVMOptions -XX:+UseContainerSupport"
2727
- GRADLE_OPTS: '-Dorg.gradle.daemon=false -Dorg.gradle.jvmargs="-XX:+HeapDumpOnOutOfMemoryError"'
2828
- BUILD_THREADS: 2
2929

@@ -35,8 +35,8 @@ macos_defaults: &macos_defaults
3535
xcode: "10.1.0"
3636

3737
# Example
38-
at-example-61: &at-example-61
39-
working_directory: ~/toolbar-android/example/ToolbarAndroidExample-061
38+
at-example-65: &at-example-65
39+
working_directory: ~/toolbar-android/example/ToolbarAndroidExample-065
4040

4141
# -------------------------
4242
# ALIASES
@@ -56,11 +56,11 @@ aliases:
5656

5757
- &restore-gradle-cache
5858
keys:
59-
- gradle-cache-{{ checksum "android/build.gradle" }}-{{ checksum "example/ToolbarAndroidExample-061/android/build.gradle" }}-{{ checksum "example/ToolbarAndroidExample-061/android/app/build.gradle" }}
59+
- gradle-cache-{{ checksum "android/build.gradle" }}-{{ checksum "example/ToolbarAndroidExample-065/android/build.gradle" }}-{{ checksum "example/ToolbarAndroidExample-065/android/app/build.gradle" }}
6060
- &save-gradle-cache
6161
paths:
6262
- ~/.gradle
63-
key: gradle-cache-{{ checksum "android/build.gradle" }}-{{ checksum "example/ToolbarAndroidExample-061/android/build.gradle" }}-{{ checksum "example/ToolbarAndroidExample-061/android/app/build.gradle" }}
63+
key: gradle-cache-{{ checksum "android/build.gradle" }}-{{ checksum "example/ToolbarAndroidExample-065/android/build.gradle" }}-{{ checksum "example/ToolbarAndroidExample-065/android/app/build.gradle" }}
6464

6565
# INSTALLATION
6666
- &yarn
@@ -105,9 +105,9 @@ jobs:
105105
- run: *yarn
106106
- save-cache: *save-yarn-cache
107107
- run:
108-
name: Checkout Example (RN61)
108+
name: Checkout Example (RN65)
109109
command: |-
110-
cd example/ToolbarAndroidExample-061
110+
cd example/ToolbarAndroidExample-065
111111
rm -rf node_modules
112112
yarn cache clean
113113
@@ -146,7 +146,7 @@ jobs:
146146
- run: *tsc
147147

148148

149-
example-61-android-compile:
149+
example-65-android-compile:
150150
<<: *android_defaults
151151
steps:
152152
- attach_workspace:
@@ -158,26 +158,26 @@ jobs:
158158
yes | sdkmanager --licenses || exit 0
159159
yes | sdkmanager --update || exit 0
160160
- run:
161-
name: Build Android Example App (RN61)
161+
name: Build Android Example App (RN65)
162162
command: |-
163-
cd example/ToolbarAndroidExample-061/android
163+
cd example/ToolbarAndroidExample-065/android
164164
./gradlew clean assembleDebug
165165
- save-cache: *save-gradle-cache
166166

167-
example-61-ios:
167+
example-65-ios:
168168
<<: *macos_defaults
169169
steps:
170170
- attach_workspace:
171171
at: ~/toolbar-android
172172
- run:
173-
name: Build iOS example app (RN61)
173+
name: Build iOS example app (RN65)
174174
command: |-
175-
cd example/ToolbarAndroidExample-061/ios
175+
cd example/ToolbarAndroidExample-065/ios
176176
rm -rf Prods
177177
pod install
178178
cd ..
179179
yarn ios
180-
# react-native run-ios --project-path example/ToolbarAndroidExample-061/ios
180+
# react-native run-ios --project-path example/ToolbarAndroidExample-065/ios
181181
182182
# -------------------------
183183
# WORKFLOWS
@@ -199,7 +199,7 @@ workflows:
199199
- tsc:
200200
requires:
201201
- linux-checkout
202-
- example-61-android-compile:
202+
- example-65-android-compile:
203203
requires:
204204
- linux-checkout
205205
# Disabled until we have macOS containers enabled

‎android/src/main/java/com/reactnativecommunity/toolbarandroid/ReactToolbar.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ public QualityInfo getQualityInfo() {
130130
return null;
131131
}
132132

133-
@Override
133+
// to be compatible with RN-0.65/fresco-2.5
134134
public Map<String, Object> getExtras() {
135135
return null;
136136
}

‎example/ToolbarAndroidExample-061/yarn.lock

+2-2
Original file line numberDiff line numberDiff line change
@@ -949,8 +949,8 @@
949949
prettier "1.16.4"
950950

951951
"@react-native-community/toolbar-android@file:../../react-native-community-toolbar-android-current.tgz":
952-
version "0.1.0-rc.1"
953-
resolved "file:../../react-native-community-toolbar-android-current.tgz#d88a050f13df0c50eb03bb2e993d1ebbf6483751"
952+
version "0.2.0"
953+
resolved "file:../../react-native-community-toolbar-android-current.tgz#77d7a9981bc9d01cd00954b39460a17e06d24573"
954954

955955
"@types/babel__core@^7.1.0":
956956
version "7.1.3"

‎example/ToolbarAndroidExample-065/ToolbarAndroidExample/ToolbarAndroidExample.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ export default class ToolbarAndroidExample extends Component<Props, State> {
3939
<View style={styles.container}>
4040
<ToolbarAndroid
4141
navIcon={require('./ic_menu_black_24dp.png')}
42-
title="ToolbarAndroid Example"
42+
title="ToolbarAndroid Example (RN-0.65)"
4343
style={styles.toolbar}
4444
actions={[
4545
{title: 'Button', icon: require('./relay.png'), show: 'always'},

‎example/ToolbarAndroidExample-065/__tests__/App-test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
import 'react-native';
66
import React from 'react';
7-
import App from '../App';
7+
import App from '../ToolbarAndroidExample';
88

99
// Note: test renderer must be required after react-native.
1010
import renderer from 'react-test-renderer';

‎example/ToolbarAndroidExample-065/android/.project

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<projectDescription>
3-
<name>android__</name>
3+
<name>ToolbarAndroidExample</name>
44
<comment>Project android__ created by Buildship.</comment>
55
<projects>
66
</projects>
@@ -16,7 +16,7 @@
1616
</natures>
1717
<filteredResources>
1818
<filter>
19-
<id>1630614539695</id>
19+
<id>0</id>
2020
<name></name>
2121
<type>30</type>
2222
<matcher>

‎example/ToolbarAndroidExample-065/android/app/.classpath

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<classpath>
3+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11/"/>
4+
<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
5+
<classpathentry kind="output" path="bin/default"/>
6+
</classpath>

‎example/ToolbarAndroidExample-065/android/app/.project

+34
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<projectDescription>
3+
<name>ToolbarAndroidExample-app</name>
4+
<comment>Project ToolbarAndroidExample-app created by Buildship.</comment>
5+
<projects>
6+
</projects>
7+
<buildSpec>
8+
<buildCommand>
9+
<name>org.eclipse.jdt.core.javabuilder</name>
10+
<arguments>
11+
</arguments>
12+
</buildCommand>
13+
<buildCommand>
14+
<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
15+
<arguments>
16+
</arguments>
17+
</buildCommand>
18+
</buildSpec>
19+
<natures>
20+
<nature>org.eclipse.jdt.core.javanature</nature>
21+
<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
22+
</natures>
23+
<filteredResources>
24+
<filter>
25+
<id>1630694511090</id>
26+
<name></name>
27+
<type>30</type>
28+
<matcher>
29+
<id>org.eclipse.core.resources.regexFilterMatcher</id>
30+
<arguments>node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
31+
</matcher>
32+
</filter>
33+
</filteredResources>
34+
</projectDescription>

‎example/ToolbarAndroidExample-065/android/app/.settings/org.eclipse.buildship.core.prefs

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
connection.project.dir=..
2+
eclipse.preferences.version=1

‎example/ToolbarAndroidExample-065/ios/Podfile.lock

+6
Original file line numberDiff line numberDiff line change
@@ -333,6 +333,8 @@ PODS:
333333
- React-cxxreact (= 0.65.1)
334334
- React-jsi (= 0.65.1)
335335
- React-perflogger (= 0.65.1)
336+
- toolbar-android (0.1.0-rc.2):
337+
- React
336338
- Yoga (1.14.0)
337339
- YogaKit (1.18.1):
338340
- Yoga (~> 1.14)
@@ -388,6 +390,7 @@ DEPENDENCIES:
388390
- React-RCTVibration (from `../node_modules/react-native/Libraries/Vibration`)
389391
- React-runtimeexecutor (from `../node_modules/react-native/ReactCommon/runtimeexecutor`)
390392
- ReactCommon/turbomodule/core (from `../node_modules/react-native/ReactCommon`)
393+
- "toolbar-android (from `../node_modules/@react-native-community/toolbar-android`)"
391394
- Yoga (from `../node_modules/react-native/ReactCommon/yoga`)
392395

393396
SPEC REPOS:
@@ -463,6 +466,8 @@ EXTERNAL SOURCES:
463466
:path: "../node_modules/react-native/ReactCommon/runtimeexecutor"
464467
ReactCommon:
465468
:path: "../node_modules/react-native/ReactCommon"
469+
toolbar-android:
470+
:path: "../node_modules/@react-native-community/toolbar-android"
466471
Yoga:
467472
:path: "../node_modules/react-native/ReactCommon/yoga"
468473

@@ -508,6 +513,7 @@ SPEC CHECKSUMS:
508513
React-RCTVibration: 92d41c2442e5328cc4d342cd7f78e5876b68bae5
509514
React-runtimeexecutor: 85187f19dd9c47a7c102f9994f9d14e4dc2110de
510515
ReactCommon: eafed38eec7b591c31751bfa7494801618460459
516+
toolbar-android: 85f3ef4d691469f2d304e7dee4bca013aa1ba1ff
511517
Yoga: aa0cb45287ebe1004c02a13f279c55a95f1572f4
512518
YogaKit: f782866e155069a2cca2517aafea43200b01fd5a
513519

‎example/ToolbarAndroidExample-065/yarn.lock

+2-2
Original file line numberDiff line numberDiff line change
@@ -1167,8 +1167,8 @@
11671167
integrity sha512-W/J0fNYVO01tioHjvYWQ9m6RgndVtbElzYozBq1ZPrHO/iCzlqoySHl4gO/fpCl9QEFjvJfjPgtPMTMlsoq5DQ==
11681168

11691169
"@react-native-community/toolbar-android@file:../../react-native-community-toolbar-android-current.tgz":
1170-
version "0.1.0-rc.2"
1171-
resolved "file:../../react-native-community-toolbar-android-current.tgz#1a14dfbbd72b0cd57e9ad2ecd2c8e1c9dfd415f9"
1170+
version "0.2.0"
1171+
resolved "file:../../react-native-community-toolbar-android-current.tgz#4d5daa9ca756c0f465db44766dfbbf9aa38f6730"
11721172

11731173
"@react-native/[email protected]":
11741174
version "1.0.0"

‎example/ToolbarAndroidExample-expo-063/android/.project

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<projectDescription>
3-
<name>android_</name>
3+
<name>ToolbarAndroidExampleexpo063</name>
44
<comment>Project android_ created by Buildship.</comment>
55
<projects>
66
</projects>
@@ -16,7 +16,7 @@
1616
</natures>
1717
<filteredResources>
1818
<filter>
19-
<id>1630614539693</id>
19+
<id>0</id>
2020
<name></name>
2121
<type>30</type>
2222
<matcher>

‎example/ToolbarAndroidExample-expo-063/android/app/.classpath

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<classpath>
3+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11/"/>
4+
<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
5+
<classpathentry kind="output" path="bin/default"/>
6+
</classpath>

‎example/ToolbarAndroidExample-expo-063/android/app/.project

+34
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<projectDescription>
3+
<name>ToolbarAndroidExampleexpo063-app</name>
4+
<comment>Project ToolbarAndroidExampleexpo063-app created by Buildship.</comment>
5+
<projects>
6+
</projects>
7+
<buildSpec>
8+
<buildCommand>
9+
<name>org.eclipse.jdt.core.javabuilder</name>
10+
<arguments>
11+
</arguments>
12+
</buildCommand>
13+
<buildCommand>
14+
<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
15+
<arguments>
16+
</arguments>
17+
</buildCommand>
18+
</buildSpec>
19+
<natures>
20+
<nature>org.eclipse.jdt.core.javanature</nature>
21+
<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
22+
</natures>
23+
<filteredResources>
24+
<filter>
25+
<id>1630694511165</id>
26+
<name></name>
27+
<type>30</type>
28+
<matcher>
29+
<id>org.eclipse.core.resources.regexFilterMatcher</id>
30+
<arguments>node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
31+
</matcher>
32+
</filter>
33+
</filteredResources>
34+
</projectDescription>

‎example/ToolbarAndroidExample-expo-063/android/app/.settings/org.eclipse.buildship.core.prefs

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
connection.project.dir=..
2+
eclipse.preferences.version=1

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@react-native-community/toolbar-android",
3-
"version": "0.2.0",
3+
"version": "0.2.1",
44
"description": "A React Native Component for Android Toolbar",
55
"keywords": [
66
"toolbar-android",

0 commit comments

Comments
 (0)