Skip to content

Commit

Permalink
[v6] Implement ML-Kit Natural Language (invertase#2117)
Browse files Browse the repository at this point in the history
 - Implement ML-Kit Natural Language (invertase#2117)
 - Includes additional refactor changes across other modules for internals api reworking
  • Loading branch information
Salakar authored Jun 2, 2019
1 parent 00d82d1 commit 1fa69e5
Show file tree
Hide file tree
Showing 39 changed files with 987 additions and 557 deletions.
1 change: 1 addition & 0 deletions RNFBApp.podspec
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
require 'json'
require './firebase_json'
package = JSON.parse(File.read(File.join(__dir__, 'package.json')))

Pod::Spec.new do |s|
Expand Down
10 changes: 10 additions & 0 deletions android/.editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# editorconfig
root = true

[*]
indent_style = space
indent_size = 2
end_of_line = lf
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true
10 changes: 8 additions & 2 deletions android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ project.ext {
],

firebase : [
core: "16.0.9",
common: "16.1.0"
core : "16.0.9",
common: "17.0.0"
],
],
])
Expand All @@ -48,6 +48,12 @@ android {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}

sourceSets {
main {
java.srcDirs = ['src/main/java', 'src/reactnative/java']
}
}
}

repositories {
Expand Down
8 changes: 8 additions & 0 deletions android/firebase-json.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,14 @@ if (jsonFile != null && jsonFile.exists()) {

if (json && json[jsonRoot]) {
String jsonStr = JsonOutput.toJson(JsonOutput.toJson(json[jsonRoot]))

rootProject.ext.firebaseJson = [
raw: json[jsonRoot],
isFlagEnabled: { key ->
return json[jsonRoot] != null && json[jsonRoot][key] == true
}
]

rootProject.logger.info ":${project.name} found react-native json root in firebase.json, creating firebase build config"
android {
defaultConfig {
Expand Down
16 changes: 1 addition & 15 deletions android/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,16 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="io.invertase.firebase">

<application>
<service android:name="com.google.firebase.components.ComponentDiscoveryService">
<meta-data android:name="com.google.firebase.components:io.invertase.firebase.app.ReactNativeFirebaseAppRegistrar"
android:value="com.google.firebase.components.ComponentRegistrar" />
</service>
<provider
android:name="io.invertase.firebase.app.ReactNativeFirebaseAppInitProvider"
android:authorities="${applicationId}.reactnativefirebaseappinitprovider"
android:exported="false"
android:initOrder="99" /> <!-- Firebase = 100, using 99 to run after Firebase initialises (highest first) -->
</application>
</manifest>
<manifest package="io.invertase.firebase" />
Empty file.
256 changes: 0 additions & 256 deletions android/src/main/java/io/invertase/firebase/common/SharedUtils.java

This file was deleted.

Loading

0 comments on commit 1fa69e5

Please sign in to comment.