Skip to content
This repository was archived by the owner on May 21, 2019. It is now read-only.

Commit 6fae78c

Browse files
authored
Fix build for Android (#297)
This will fix build for Android because of move from `compile` to `implementation` in `build.gradle`
1 parent 5791440 commit 6fae78c

File tree

107 files changed

+2276
-10009
lines changed

Some content is hidden

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

107 files changed

+2276
-10009
lines changed

.travis.yml

+2-27
Original file line numberDiff line numberDiff line change
@@ -26,37 +26,12 @@ matrix:
2626
- .travis/before_install.sh
2727
android:
2828
components:
29-
- build-tools-23.0.1
30-
- android-23
29+
- build-tools-27.0.3
30+
- android-27
3131
- extra-android-m2repository
3232
- extra-google-google_play_services
3333
- extra-google-m2repository
3434
- addon-google_apis-google-16
35-
env: LANE='android'
36-
script: .travis/run.sh
37-
- language: android
38-
sudo: required
39-
jdk: oraclejdk8
40-
before_cache:
41-
- rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
42-
- rm -rf $HOME/.gradle/caches/*/plugin-resolution/
43-
cache:
44-
directories:
45-
- $HOME/.yarn-cache
46-
- $HOME/.gradle/caches/
47-
- $HOME/.gradle/wrapper/
48-
before_install:
49-
- nvm install 8
50-
- .travis/before_install.sh
51-
android:
52-
components:
53-
- build-tools-26.0.3
54-
- android-26
55-
- extra-android-m2repository
56-
- extra-google-google_play_services
57-
- extra-google-m2repository
58-
- addon-google_apis-google-16
59-
env: LANE='android-post56'
6035
script: .travis/run.sh
6136
- language: objective-c
6237
os: osx

.travis/before_install.sh

-3
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,4 @@ if [ "$LANE" = "ios" ]; then
77
elif [ "$LANE" = "android" ]; then
88
node --version
99
npm install -g yarn
10-
elif [ "$LANE" = "android-post56" ]; then
11-
node --version
12-
npm install -g yarn
1310
fi

.travis/run.sh

+7-15
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,17 @@
11
#!/bin/sh
22
set -e
3+
4+
yarn install
5+
yarn run tsc
6+
cd examples/rn57example
7+
yarn install
8+
rm -rf node_modules/react-native-google-analytics-bridge/examples
9+
310
if [ "$LANE" = "node" ]; then
4-
yarn install
5-
yarn run tsc
6-
cd examples/preRN56Example
7-
yarn install
8-
rm -rf node_modules/react-native-google-analytics-bridge/examples
911
yarn run tsc
1012
else
1113
npm install -g react-native-cli
1214
react-native -v
13-
yarn install
14-
yarn run tsc
15-
16-
if [ "$LANE" = "android-post56" ]; then
17-
cd examples/postRN56Example
18-
else
19-
cd examples/preRN56Example
20-
fi
21-
yarn install
22-
rm -rf node_modules/react-native-google-analytics-bridge/examples
2315

2416
if [ "$LANE" = "ios" ]; then
2517
xcodebuild -project ios/example.xcodeproj/ -configuration Debug -sdk iphonesimulator -scheme example CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO

examples/postRN56Example/.babelrc

-3
This file was deleted.

examples/postRN56Example/android/build.gradle

-43
This file was deleted.
Binary file not shown.

examples/postRN56Example/index.js

-6
This file was deleted.

examples/postRN56Example/ios/example.xcodeproj/xcshareddata/xcschemes/example.xcscheme

-129
This file was deleted.

examples/postRN56Example/ios/exampleTests/Info.plist

-24
This file was deleted.

examples/preRN56Example/.babelrc

-3
This file was deleted.

examples/preRN56Example/.buckconfig

-6
This file was deleted.

examples/preRN56Example/.flowconfig

-54
This file was deleted.

examples/preRN56Example/.gitattributes

-1
This file was deleted.

0 commit comments

Comments
 (0)