Skip to content

Commit

Permalink
Upgrade mocha example proj
Browse files Browse the repository at this point in the history
  • Loading branch information
d4vidi committed Jun 3, 2019
1 parent 47feb6c commit b056cb0
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 14 deletions.
8 changes: 4 additions & 4 deletions examples/demo-react-native/android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ import com.android.build.OutputFile
apply from: "../../node_modules/react-native/react.gradle"

android {
compileSdkVersion 27
buildToolsVersion '27.0.3'
compileSdkVersion 28
buildToolsVersion '28.0.3'

defaultConfig {
applicationId "com.detox.rn.example"
minSdkVersion 18
targetSdkVersion 26
targetSdkVersion 28
versionCode 1
versionName "1.0"
ndk {
Expand Down Expand Up @@ -70,7 +70,7 @@ android {
}

dependencies {
implementation 'com.android.support:appcompat-v7:27.1.1'
implementation 'com.android.support:appcompat-v7:28.0.0'
implementation 'com.facebook.react:react-native:+' // From node_modules

androidTestImplementation('com.wix:detox:+') { transitive = true }
Expand Down
Original file line number Diff line number Diff line change
@@ -1,21 +1,20 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.example"
android:versionCode="1"
android:versionName="1.0">
android:versionName="1.0"
>

<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>

<uses-sdk
android:minSdkVersion="16"
android:targetSdkVersion="22" />

<application
android:name=".MainApplication"
android:allowBackup="true"
android:label="@string/app_name"
android:icon="@mipmap/ic_launcher"
android:theme="@style/AppTheme">
android:theme="@style/AppTheme"
android:usesCleartextTraffic="true"
>
<activity
android:name=".MainActivity"
android:label="@string/app_name"
Expand Down
2 changes: 1 addition & 1 deletion examples/demo-react-native/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ buildscript {
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.1.4'
classpath 'com.android.tools.build:gradle:3.3.2'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
}
}
Expand Down
1 change: 0 additions & 1 deletion examples/demo-react-native/android/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,3 @@ org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryErro
# org.gradle.parallel=true

android.useDeprecatedNdk=true
android.enableAapt2=false
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Sat Sep 09 20:32:40 IDT 2017
#Mon Jun 03 11:38:02 IDT 2019
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip
4 changes: 4 additions & 0 deletions scripts/demo-projects.android.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
#!/bin/bash -e

# TODO Remove this once migration is merged-in. It's only needed for the transitional state.
echo "*** Forcing react-native version to 0.59.8 instead of $REACT_NATIVE_VERSION ***"
export REACT_NATIVE_VERSION="0.59.8"

# Approve unapproved SDK licenses
yes | $ANDROID_HOME/tools/bin/sdkmanager --licenses

Expand Down

0 comments on commit b056cb0

Please sign in to comment.