Skip to content

Commit ae2917f

Browse files
author
Kadi Kraman
committed
chore(e2e): update android config
1 parent 01128c2 commit ae2917f

File tree

3 files changed

+15
-90
lines changed

3 files changed

+15
-90
lines changed

packages/integrations/integrations.yml

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
android:
1818
maven:
1919
repo: https://maven.localytics.com/public
20-
disabled: true
2120

2221
- name: Quantcast
2322
ios:
@@ -28,8 +27,6 @@
2827
ios:
2928
pod:
3029
version: 1.0.0-beta
31-
android:
32-
disabled: true
3330

3431
- name: Tapstream
3532
ios:
@@ -38,25 +35,19 @@
3835
disabled: true
3936
pod:
4037
name: Tapstream-Segment
41-
android:
42-
disabled: true
4338

4439
- name: Appboy
4540
android:
4641
maven:
4742
repo: https://appboy.github.io/appboy-android-sdk/sdk
4843
name: com.appboy:appboy-segment-integration
49-
disabled: true
5044

5145
- name: Firebase
5246
android:
5347
maven:
5448
repo: https://maven.google.com
55-
disabled: true
5649

5750
- name: Bugsnag
58-
android:
59-
disabled: true
6051

6152
- name: ComScore
6253
# https://github.com/segment-integrations/analytics-android-integration-comscore
@@ -82,7 +73,6 @@
8273
maven:
8374
name: com.appsflyer:segment-android-integration
8475
version: 1.+
85-
disabled: true
8676

8777
- name: Branch
8878
# https://github.com/BranchMetrics/Segment-Branch-iOS
@@ -92,4 +82,3 @@
9282
android:
9383
maven:
9484
name: io.branch.segment.analytics.android.integrations:branch
95-
disabled: true

packages/test-app/seed/android/app/build.gradle

Lines changed: 12 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -2,76 +2,6 @@ apply plugin: "com.android.application"
22

33
import com.android.build.OutputFile
44

5-
/**
6-
* The react.gradle file registers a task for each build variant (e.g. bundleDebugJsAndAssets
7-
* and bundleReleaseJsAndAssets).
8-
* These basically call `react-native bundle` with the correct arguments during the Android build
9-
* cycle. By default, bundleDebugJsAndAssets is skipped, as in debug/dev mode we prefer to load the
10-
* bundle directly from the development server. Below you can see all the possible configurations
11-
* and their defaults. If you decide to add a configuration block, make sure to add it before the
12-
* `apply from: "../../node_modules/react-native/react.gradle"` line.
13-
*
14-
* project.ext.react = [
15-
* // the name of the generated asset file containing your JS bundle
16-
* bundleAssetName: "index.android.bundle",
17-
*
18-
* // the entry file for bundle generation
19-
* entryFile: "index.android.js",
20-
*
21-
* // whether to bundle JS and assets in debug mode
22-
* bundleInDebug: false,
23-
*
24-
* // whether to bundle JS and assets in release mode
25-
* bundleInRelease: true,
26-
*
27-
* // whether to bundle JS and assets in another build variant (if configured).
28-
* // See http://tools.android.com/tech-docs/new-build-system/user-guide#TOC-Build-Variants
29-
* // The configuration property can be in the following formats
30-
* // 'bundleIn${productFlavor}${buildType}'
31-
* // 'bundleIn${buildType}'
32-
* // bundleInFreeDebug: true,
33-
* // bundleInPaidRelease: true,
34-
* // bundleInBeta: true,
35-
*
36-
* // whether to disable dev mode in custom build variants (by default only disabled in release)
37-
* // for example: to disable dev mode in the staging build type (if configured)
38-
* devDisabledInStaging: true,
39-
* // The configuration property can be in the following formats
40-
* // 'devDisabledIn${productFlavor}${buildType}'
41-
* // 'devDisabledIn${buildType}'
42-
*
43-
* // the root of your project, i.e. where "package.json" lives
44-
* root: "../../",
45-
*
46-
* // where to put the JS bundle asset in debug mode
47-
* jsBundleDirDebug: "$buildDir/intermediates/assets/debug",
48-
*
49-
* // where to put the JS bundle asset in release mode
50-
* jsBundleDirRelease: "$buildDir/intermediates/assets/release",
51-
*
52-
* // where to put drawable resources / React Native assets, e.g. the ones you use via
53-
* // require('./image.png')), in debug mode
54-
* resourcesDirDebug: "$buildDir/intermediates/res/merged/debug",
55-
*
56-
* // where to put drawable resources / React Native assets, e.g. the ones you use via
57-
* // require('./image.png')), in release mode
58-
* resourcesDirRelease: "$buildDir/intermediates/res/merged/release",
59-
*
60-
* // by default the gradle tasks are skipped if none of the JS files or assets change; this means
61-
* // that we don't look at files in android/ or ios/ to determine whether the tasks are up to
62-
* // date; if you have any other folders that you want to ignore for performance reasons (gradle
63-
* // indexes the entire tree), add them here. Alternatively, if you have JS files in android/
64-
* // for example, you might want to remove it from here.
65-
* inputExcludes: ["android/**", "ios/**"],
66-
*
67-
* // override which node gets called and with what additional arguments
68-
* nodeExecutableAndArgs: ["node"],
69-
*
70-
* // supply additional arguments to the packager
71-
* extraPackagerArgs: []
72-
* ]
73-
*/
74-
755
project.ext.react = [
766
entryFile: "index.js"
777
]
@@ -99,7 +29,7 @@ android {
9929
signingConfigs {
10030

10131
release {
102-
storeFile file('android.keystore')
32+
storeFile file("android.keystore")
10333
storePassword "notSecret"
10434
keyAlias "segmentTesting"
10535
keyPassword "notSecret"
@@ -121,8 +51,9 @@ android {
12151
targetSdkVersion rootProject.ext.targetSdkVersion
12252
versionCode 1
12353
versionName "1.0"
124-
testBuildType System.getProperty('testBuildType', 'debug') // This will later be used to control the test apk build type
125-
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
54+
testBuildType System.getProperty("testBuildType", "debug") // This will later be used to control the test apk build type
55+
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
56+
multiDexEnabled true
12657
}
12758
splits {
12859
abi {
@@ -153,19 +84,24 @@ android {
15384
}
15485
}
15586
}
87+
lintOptions {
88+
checkReleaseBuilds false
89+
}
15690
}
15791

15892
dependencies {
15993
implementation fileTree(dir: "libs", include: ["*.jar"])
16094
implementation "com.android.support:appcompat-v7:${rootProject.ext.supportLibVersion}"
16195
implementation "com.facebook.react:react-native:+" // From node_modules
162-
androidTestImplementation('com.wix:detox:+') { transitive = true }
163-
androidTestImplementation 'junit:junit:4.12'
96+
implementation "com.android.support:design:27.1.0"
97+
implementation 'com.android.support:multidex:1.0.3'
98+
androidTestImplementation("com.wix:detox:+") { transitive = true }
99+
androidTestImplementation "junit:junit:4.12"
164100
}
165101

166102
// Run this once to be able to run the application with BUCK
167103
// puts all compile dependencies into folder libs for BUCK to use
168104
task copyDownloadableDepsToLibs(type: Copy) {
169105
from configurations.compile
170-
into 'libs'
106+
into "libs"
171107
}

packages/test-app/test_android.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ pushd project
66
yarn react-native link
77
popd
88

9-
detox build --configuration android.emu.debug
10-
# detox test --configuration android.emu.debug
9+
detox build --configuration android.emu.release
10+
# detox test --configuration android.emu.release
1111

1212
# The CircleCI Android docker image does not support running emulators: https://circleci.com/docs/2.0/language-android/
13-
# To run this on CI, would have to use the RN community orbs: https://circleci.com/orbs/registry/orb/react-native-community/react-native
13+
# To run this on CI, use the RN community orbs: https://circleci.com/orbs/registry/orb/react-native-community/react-native

0 commit comments

Comments
 (0)