From c8895927f824b289aae49f55b17786b07c6ced96 Mon Sep 17 00:00:00 2001 From: Salakar Date: Fri, 22 Mar 2019 13:48:20 +0000 Subject: [PATCH 1/7] [template] configure auto-modules for ios --- template/ios/Podfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/template/ios/Podfile b/template/ios/Podfile index 9e03f39d025abe..693551f22884db 100644 --- a/template/ios/Podfile +++ b/template/ios/Podfile @@ -1,4 +1,5 @@ platform :ios, '9.0' +require_relative '../node_modules/@react-native-community/cli/native_modules' target 'HelloWorld' do # Pods for HelloWorld @@ -32,6 +33,8 @@ target 'HelloWorld' do inherit! :search_paths # Pods for testing end + + use_native_modules! end target 'HelloWorld-tvOS' do From e906562e3a621ee9d7f9d968cd925849786355ea Mon Sep 17 00:00:00 2001 From: Salakar Date: Fri, 22 Mar 2019 13:51:37 +0000 Subject: [PATCH 2/7] [template] configure auto-modules for android --- template/android/app/build.gradle | 2 ++ .../src/main/java/com/helloworld/MainApplication.java | 11 ++++++----- template/android/settings.gradle | 2 +- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/template/android/app/build.gradle b/template/android/app/build.gradle index 1ddcb478006e36..021f73fbbbcbca 100644 --- a/template/android/app/build.gradle +++ b/template/android/app/build.gradle @@ -162,3 +162,5 @@ task copyDownloadableDepsToLibs(type: Copy) { from configurations.compile into 'libs' } + +apply from: file("../../node_modules/@react-native-community/cli/native_modules.gradle"); applyNativeModulesAppBuildGradle(project) diff --git a/template/android/app/src/main/java/com/helloworld/MainApplication.java b/template/android/app/src/main/java/com/helloworld/MainApplication.java index 8b5a7f97bea556..e65ec1ba648562 100644 --- a/template/android/app/src/main/java/com/helloworld/MainApplication.java +++ b/template/android/app/src/main/java/com/helloworld/MainApplication.java @@ -2,13 +2,13 @@ import android.app.Application; +import com.facebook.react.PackageList; import com.facebook.react.ReactApplication; import com.facebook.react.ReactNativeHost; import com.facebook.react.ReactPackage; -import com.facebook.react.shell.MainReactPackage; import com.facebook.soloader.SoLoader; -import java.util.Arrays; +import java.util.ArrayList; import java.util.List; public class MainApplication extends Application implements ReactApplication { @@ -21,9 +21,10 @@ public boolean getUseDeveloperSupport() { @Override protected List getPackages() { - return Arrays.asList( - new MainReactPackage() - ); + List packages = new ArrayList<>(PackageList.getPackages()); + // additional non auto-detected packages can be added here, e.g.: + // packages.add(new MyReactNativePackage()); + return packages; } @Override diff --git a/template/android/settings.gradle b/template/android/settings.gradle index 32e6f44c4b2df5..84e221ebc3398f 100644 --- a/template/android/settings.gradle +++ b/template/android/settings.gradle @@ -1,3 +1,3 @@ rootProject.name = 'HelloWorld' - +apply from: file("../node_modules/@react-native-community/cli/native_modules.gradle"); applyNativeModulesSettingsGradle(settings) include ':app' From a58d6e6f0733bb5f1a46f1d133e042ed2507d084 Mon Sep 17 00:00:00 2001 From: Salakar Date: Sat, 23 Mar 2019 20:50:30 +0000 Subject: [PATCH 3/7] change PackageList usage to support new init for backwards compat, see https://github.com/react-native-community/react-native-cli/pull/258#issuecomment-475670604 --- .../app/src/main/java/com/helloworld/MainApplication.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template/android/app/src/main/java/com/helloworld/MainApplication.java b/template/android/app/src/main/java/com/helloworld/MainApplication.java index e65ec1ba648562..7602b3e4321ed9 100644 --- a/template/android/app/src/main/java/com/helloworld/MainApplication.java +++ b/template/android/app/src/main/java/com/helloworld/MainApplication.java @@ -21,7 +21,7 @@ public boolean getUseDeveloperSupport() { @Override protected List getPackages() { - List packages = new ArrayList<>(PackageList.getPackages()); + List packages = new ArrayList<>((new PackageList(this)).getPackages()); // additional non auto-detected packages can be added here, e.g.: // packages.add(new MyReactNativePackage()); return packages; From ff0d5df489e3ec2719a98ab4c3664d7153ac7621 Mon Sep 17 00:00:00 2001 From: Salakar Date: Thu, 18 Apr 2019 10:51:15 +0100 Subject: [PATCH 4/7] update android auto-linking template config --- template/android/app/build.gradle | 2 +- .../app/src/main/java/com/helloworld/MainApplication.java | 7 ++++--- template/android/settings.gradle | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/template/android/app/build.gradle b/template/android/app/build.gradle index 021f73fbbbcbca..b505939411926f 100644 --- a/template/android/app/build.gradle +++ b/template/android/app/build.gradle @@ -163,4 +163,4 @@ task copyDownloadableDepsToLibs(type: Copy) { into 'libs' } -apply from: file("../../node_modules/@react-native-community/cli/native_modules.gradle"); applyNativeModulesAppBuildGradle(project) +apply from: file("../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project) diff --git a/template/android/app/src/main/java/com/helloworld/MainApplication.java b/template/android/app/src/main/java/com/helloworld/MainApplication.java index 7602b3e4321ed9..cc3d5a201e46d4 100644 --- a/template/android/app/src/main/java/com/helloworld/MainApplication.java +++ b/template/android/app/src/main/java/com/helloworld/MainApplication.java @@ -21,9 +21,10 @@ public boolean getUseDeveloperSupport() { @Override protected List getPackages() { - List packages = new ArrayList<>((new PackageList(this)).getPackages()); - // additional non auto-detected packages can be added here, e.g.: - // packages.add(new MyReactNativePackage()); + @SuppressWarnings("UnnecessaryLocalVariable") + List packages = new PackageList(this).getPackages(); + // additional non auto detected packages can still be added here: + // packages.add(new SomeReactNativePackage()); return packages; } diff --git a/template/android/settings.gradle b/template/android/settings.gradle index 84e221ebc3398f..e50c29d6298864 100644 --- a/template/android/settings.gradle +++ b/template/android/settings.gradle @@ -1,3 +1,3 @@ rootProject.name = 'HelloWorld' -apply from: file("../node_modules/@react-native-community/cli/native_modules.gradle"); applyNativeModulesSettingsGradle(settings) +apply from: file("../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesSettingsGradle(settings) include ':app' From 7c38e7b57d3d184ccca4f5716d73e99061b75f43 Mon Sep 17 00:00:00 2001 From: Salakar Date: Thu, 18 Apr 2019 10:53:35 +0100 Subject: [PATCH 5/7] update ios template auto linking config --- template/ios/Podfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template/ios/Podfile b/template/ios/Podfile index 0936839ac83606..a25e513a914b07 100644 --- a/template/ios/Podfile +++ b/template/ios/Podfile @@ -1,5 +1,5 @@ platform :ios, '9.0' -require_relative '../node_modules/@react-native-community/cli/native_modules' +require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules' target 'HelloWorld' do # Pods for HelloWorld From 2cfea5e1c7d0f8a2f33b6cd7cae2ec0e374ea3e4 Mon Sep 17 00:00:00 2001 From: Salakar Date: Thu, 18 Apr 2019 10:57:23 +0100 Subject: [PATCH 6/7] remove unused android import --- .../app/src/main/java/com/helloworld/MainApplication.java | 1 - 1 file changed, 1 deletion(-) diff --git a/template/android/app/src/main/java/com/helloworld/MainApplication.java b/template/android/app/src/main/java/com/helloworld/MainApplication.java index cc3d5a201e46d4..49329aba0699bc 100644 --- a/template/android/app/src/main/java/com/helloworld/MainApplication.java +++ b/template/android/app/src/main/java/com/helloworld/MainApplication.java @@ -8,7 +8,6 @@ import com.facebook.react.ReactPackage; import com.facebook.soloader.SoLoader; -import java.util.ArrayList; import java.util.List; public class MainApplication extends Application implements ReactApplication { From 7a90b84ca4643a181a5630c2b72365dbd9947ca9 Mon Sep 17 00:00:00 2001 From: Christoph Nakazawa Date: Wed, 24 Apr 2019 13:32:53 +0100 Subject: [PATCH 7/7] Update MainApplication.java --- .../app/src/main/java/com/helloworld/MainApplication.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/template/android/app/src/main/java/com/helloworld/MainApplication.java b/template/android/app/src/main/java/com/helloworld/MainApplication.java index 49329aba0699bc..c35b27063797cf 100644 --- a/template/android/app/src/main/java/com/helloworld/MainApplication.java +++ b/template/android/app/src/main/java/com/helloworld/MainApplication.java @@ -22,8 +22,8 @@ public boolean getUseDeveloperSupport() { protected List getPackages() { @SuppressWarnings("UnnecessaryLocalVariable") List packages = new PackageList(this).getPackages(); - // additional non auto detected packages can still be added here: - // packages.add(new SomeReactNativePackage()); + // Packages that cannot be autolinked yet can be added manually here, for example: + // packages.add(new MyReactNativePackage()); return packages; }