Skip to content
This repository was archived by the owner on Jun 16, 2023. It is now read-only.

Commit 72c5624

Browse files
sytolksibelius
authored andcommitted
fix(example): fixes and updates in mlkit example (#2618)
1 parent 0af8ea9 commit 72c5624

File tree

7 files changed

+1660
-1403
lines changed

7 files changed

+1660
-1403
lines changed

android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ buildscript {
99
}
1010

1111
dependencies {
12-
classpath 'com.android.tools.build:gradle:3.3.1'
12+
classpath 'com.android.tools.build:gradle:3.5.2'
1313
}
1414
}
1515

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,32 @@
11
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2-
package="com.mlkit">
2+
package="com.mlkit">
33

44
<uses-permission android:name="android.permission.INTERNET" />
5-
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
5+
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
66
<uses-permission android:name="android.permission.CAMERA" />
7-
<uses-permission android:name="android.permission.RECORD_AUDIO"/>
7+
<uses-permission android:name="android.permission.RECORD_AUDIO" />
88
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
99
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
1010

1111
<application
12-
android:name=".MainApplication"
13-
android:label="@string/app_name"
14-
android:icon="@mipmap/ic_launcher"
15-
android:roundIcon="@mipmap/ic_launcher_round"
16-
android:allowBackup="false"
17-
android:theme="@style/AppTheme">
18-
<activity
19-
android:name=".MainActivity"
12+
android:name=".MainApplication"
13+
android:allowBackup="false"
14+
android:icon="@mipmap/ic_launcher"
2015
android:label="@string/app_name"
21-
android:configChanges="keyboard|keyboardHidden|orientation|screenSize"
22-
android:windowSoftInputMode="adjustResize">
23-
<intent-filter>
24-
<action android:name="android.intent.action.MAIN" />
25-
<category android:name="android.intent.category.LAUNCHER" />
26-
</intent-filter>
27-
</activity>
28-
<activity android:name="com.facebook.react.devsupport.DevSettingsActivity" />
16+
android:roundIcon="@mipmap/ic_launcher_round"
17+
android:theme="@style/AppTheme"
18+
android:usesCleartextTraffic="true">
19+
<activity
20+
android:name=".MainActivity"
21+
android:configChanges="keyboard|keyboardHidden|orientation|screenSize"
22+
android:label="@string/app_name"
23+
android:windowSoftInputMode="adjustResize">
24+
<intent-filter>
25+
<action android:name="android.intent.action.MAIN" />
26+
<category android:name="android.intent.category.LAUNCHER" />
27+
</intent-filter>
28+
</activity>
29+
<activity android:name="com.facebook.react.devsupport.DevSettingsActivity" />
2930
</application>
3031

3132
</manifest>

examples/mlkit/android/build.gradle

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,3 @@ allprojects {
3232
}
3333
}
3434
}
35-
36-
37-
task wrapper(type: Wrapper) {
38-
gradleVersion = '4.7'
39-
distributionUrl = distributionUrl.replace("bin", "all")
40-
}

examples/mlkit/android/gradle.properties

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,6 @@ org.gradle.jvmargs=-Xmx4g -XX:MaxPermSize=1g -XX:+HeapDumpOnOutOfMemoryError -Df
1616
# This option should only be used with decoupled projects. More details, visit
1717
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
1818
# org.gradle.parallel=true
19+
20+
android.useAndroidX=true
21+
android.enableJetifier=true
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1+
#Mon Dec 02 11:05:01 EET 2019
12
distributionBase=GRADLE_USER_HOME
23
distributionPath=wrapper/dists
34
zipStoreBase=GRADLE_USER_HOME
45
zipStorePath=wrapper/dists
5-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip

examples/mlkit/package.json

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,14 @@
1111
"react-native": "0.59.1"
1212
},
1313
"devDependencies": {
14-
"babel-core": "^7.0.0-bridge.0",
15-
"babel-jest": "24.1.0",
16-
"jest": "24.1.0",
17-
"metro-react-native-babel-preset": "0.53.1",
14+
"@babel/core": "^7.6.2",
15+
"@babel/runtime": "^7.6.2",
16+
"babel-jest": "^24.9.0",
17+
"jest": "^24.9.0",
18+
"metro-react-native-babel-preset": "^0.56.1",
1819
"react-test-renderer": "16.8.3"
1920
},
2021
"jest": {
2122
"preset": "react-native"
2223
}
23-
}
24+
}

0 commit comments

Comments
 (0)