Skip to content

Commit 44e78ff

Browse files
cortinicofacebook-github-bot
authored andcommitted
Fix accidentally broken build_android job
Summary: I accidentally broke build_android. Here the two fixes: 1. Make sure the constructor of PackageList2 are actually called `PackageList2` 2. Make sure the package of `OSSLibraryExamplePackage` is `com.facebook.react.osslibraryexample` Changelog: [Internal] [Changed] - Fix accidentally broken build_android job Reviewed By: dmytrorykun Differential Revision: D56756601 fbshipit-source-id: 862597ca829d702d880624d29276193f8548715d
1 parent 845a879 commit 44e78ff

File tree

7 files changed

+17
-17
lines changed

7 files changed

+17
-17
lines changed

packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/tasks/GeneratePackageListTask.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -132,20 +132,20 @@ abstract class GeneratePackageListTask : DefaultTask() {
132132
private ReactNativeHost reactNativeHost;
133133
private MainPackageConfig mConfig;
134134
135-
public PackageList(ReactNativeHost reactNativeHost) {
135+
public PackageList2(ReactNativeHost reactNativeHost) {
136136
this(reactNativeHost, null);
137137
}
138138
139-
public PackageList(Application application) {
139+
public PackageList2(Application application) {
140140
this(application, null);
141141
}
142142
143-
public PackageList(ReactNativeHost reactNativeHost, MainPackageConfig config) {
143+
public PackageList2(ReactNativeHost reactNativeHost, MainPackageConfig config) {
144144
this.reactNativeHost = reactNativeHost;
145145
mConfig = config;
146146
}
147147
148-
public PackageList(Application application, MainPackageConfig config) {
148+
public PackageList2(Application application, MainPackageConfig config) {
149149
this.reactNativeHost = null;
150150
this.application = application;
151151
mConfig = config;

packages/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/tasks/GeneratePackageListTaskTest.kt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -147,20 +147,20 @@ class GeneratePackageListTaskTest {
147147
private ReactNativeHost reactNativeHost;
148148
private MainPackageConfig mConfig;
149149
150-
public PackageList(ReactNativeHost reactNativeHost) {
150+
public PackageList2(ReactNativeHost reactNativeHost) {
151151
this(reactNativeHost, null);
152152
}
153153
154-
public PackageList(Application application) {
154+
public PackageList2(Application application) {
155155
this(application, null);
156156
}
157157
158-
public PackageList(ReactNativeHost reactNativeHost, MainPackageConfig config) {
158+
public PackageList2(ReactNativeHost reactNativeHost, MainPackageConfig config) {
159159
this.reactNativeHost = reactNativeHost;
160160
mConfig = config;
161161
}
162162
163-
public PackageList(Application application, MainPackageConfig config) {
163+
public PackageList2(Application application, MainPackageConfig config) {
164164
this.reactNativeHost = null;
165165
this.application = application;
166166
mConfig = config;
@@ -226,20 +226,20 @@ class GeneratePackageListTaskTest {
226226
private ReactNativeHost reactNativeHost;
227227
private MainPackageConfig mConfig;
228228
229-
public PackageList(ReactNativeHost reactNativeHost) {
229+
public PackageList2(ReactNativeHost reactNativeHost) {
230230
this(reactNativeHost, null);
231231
}
232232
233-
public PackageList(Application application) {
233+
public PackageList2(Application application) {
234234
this(application, null);
235235
}
236236
237-
public PackageList(ReactNativeHost reactNativeHost, MainPackageConfig config) {
237+
public PackageList2(ReactNativeHost reactNativeHost, MainPackageConfig config) {
238238
this.reactNativeHost = reactNativeHost;
239239
mConfig = config;
240240
}
241241
242-
public PackageList(Application application, MainPackageConfig config) {
242+
public PackageList2(Application application, MainPackageConfig config) {
243243
this.reactNativeHost = null;
244244
this.application = application;
245245
mConfig = config;
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* LICENSE file in the root directory of this source tree.
66
*/
77

8-
package com.reactnative.osslibraryexample
8+
package com.facebook.react.osslibraryexample
99

1010
import com.facebook.fbreact.specs.NativeSampleModuleSpec
1111
import com.facebook.react.bridge.ReactApplicationContext
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* LICENSE file in the root directory of this source tree.
66
*/
77

8-
package com.reactnative.osslibraryexample
8+
package com.facebook.react.osslibraryexample
99

1010
import com.facebook.react.ReactPackage
1111
import com.facebook.react.bridge.NativeModule
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* LICENSE file in the root directory of this source tree.
66
*/
77

8-
package com.reactnative.osslibraryexample
8+
package com.facebook.react.osslibraryexample
99

1010
import android.annotation.SuppressLint
1111
import android.graphics.Color
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* LICENSE file in the root directory of this source tree.
66
*/
77

8-
package com.reactnative.osslibraryexample
8+
package com.facebook.react.osslibraryexample
99

1010
import android.graphics.drawable.GradientDrawable
1111
import android.view.View

packages/rn-tester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterApplication.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,14 @@ import com.facebook.react.defaults.DefaultReactHost
2525
import com.facebook.react.defaults.DefaultReactNativeHost
2626
import com.facebook.react.module.model.ReactModuleInfo
2727
import com.facebook.react.module.model.ReactModuleInfoProvider
28+
import com.facebook.react.osslibraryexample.OSSLibraryExamplePackage
2829
import com.facebook.react.popupmenu.PopupMenuPackage
2930
import com.facebook.react.shell.MainReactPackage
3031
import com.facebook.react.uiapp.component.MyLegacyViewManager
3132
import com.facebook.react.uiapp.component.MyNativeViewManager
3233
import com.facebook.react.uimanager.ReactShadowNode
3334
import com.facebook.react.uimanager.ViewManager
3435
import com.facebook.soloader.SoLoader
35-
import com.reactnative.osslibraryexample.OSSLibraryExamplePackage
3636

3737
class RNTesterApplication : Application(), ReactApplication {
3838
override val reactNativeHost: ReactNativeHost by lazy {

0 commit comments

Comments
 (0)