From 8d4a2a03e36546ec05fc67560371731f79f05281 Mon Sep 17 00:00:00 2001 From: Sam Ilic Date: Thu, 20 Feb 2025 21:01:20 +1100 Subject: [PATCH 1/2] Fix for android build on RN77 --- .../RNGoogleMobileAdsMediaViewManagerDelegate.java | 5 +++-- .../RNGoogleMobileAdsNativeViewManagerDelegate.java | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/android/src/oldarch/com/facebook/react/viewmanagers/RNGoogleMobileAdsMediaViewManagerDelegate.java b/android/src/oldarch/com/facebook/react/viewmanagers/RNGoogleMobileAdsMediaViewManagerDelegate.java index 10379f25..04d8f1fc 100644 --- a/android/src/oldarch/com/facebook/react/viewmanagers/RNGoogleMobileAdsMediaViewManagerDelegate.java +++ b/android/src/oldarch/com/facebook/react/viewmanagers/RNGoogleMobileAdsMediaViewManagerDelegate.java @@ -3,12 +3,13 @@ import android.view.View; import androidx.annotation.NonNull; import androidx.annotation.Nullable; +import com.facebook.react.uimanager.BaseViewManager; import com.facebook.react.uimanager.BaseViewManagerDelegate; -import com.facebook.react.uimanager.BaseViewManagerInterface; +import com.facebook.react.uimanager.LayoutShadowNode; public class RNGoogleMobileAdsMediaViewManagerDelegate< T extends View, - U extends BaseViewManagerInterface & RNGoogleMobileAdsMediaViewManagerInterface> + U extends BaseViewManager & RNGoogleMobileAdsMediaViewManagerInterface> extends BaseViewManagerDelegate { public RNGoogleMobileAdsMediaViewManagerDelegate(U viewManager) { super(viewManager); diff --git a/android/src/oldarch/com/facebook/react/viewmanagers/RNGoogleMobileAdsNativeViewManagerDelegate.java b/android/src/oldarch/com/facebook/react/viewmanagers/RNGoogleMobileAdsNativeViewManagerDelegate.java index f108b8d4..7123cb1d 100644 --- a/android/src/oldarch/com/facebook/react/viewmanagers/RNGoogleMobileAdsNativeViewManagerDelegate.java +++ b/android/src/oldarch/com/facebook/react/viewmanagers/RNGoogleMobileAdsNativeViewManagerDelegate.java @@ -4,12 +4,13 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import com.facebook.react.bridge.ReadableArray; +import com.facebook.react.uimanager.BaseViewManager; import com.facebook.react.uimanager.BaseViewManagerDelegate; -import com.facebook.react.uimanager.BaseViewManagerInterface; +import com.facebook.react.uimanager.LayoutShadowNode; public class RNGoogleMobileAdsNativeViewManagerDelegate< T extends View, - U extends BaseViewManagerInterface & RNGoogleMobileAdsNativeViewManagerInterface> + U extends BaseViewManager & RNGoogleMobileAdsNativeViewManagerInterface> extends BaseViewManagerDelegate { public RNGoogleMobileAdsNativeViewManagerDelegate(U viewManager) { super(viewManager); From a41d2a644b9c7ac0fd17d3466bc6625d108fd0dc Mon Sep 17 00:00:00 2001 From: Sam Ilic Date: Wed, 26 Feb 2025 20:48:59 +1100 Subject: [PATCH 2/2] Format java files --- .../RNGoogleMobileAdsMediaViewManagerDelegate.java | 4 +++- .../RNGoogleMobileAdsNativeViewManagerDelegate.java | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/android/src/oldarch/com/facebook/react/viewmanagers/RNGoogleMobileAdsMediaViewManagerDelegate.java b/android/src/oldarch/com/facebook/react/viewmanagers/RNGoogleMobileAdsMediaViewManagerDelegate.java index 04d8f1fc..f02fc55b 100644 --- a/android/src/oldarch/com/facebook/react/viewmanagers/RNGoogleMobileAdsMediaViewManagerDelegate.java +++ b/android/src/oldarch/com/facebook/react/viewmanagers/RNGoogleMobileAdsMediaViewManagerDelegate.java @@ -9,7 +9,9 @@ public class RNGoogleMobileAdsMediaViewManagerDelegate< T extends View, - U extends BaseViewManager & RNGoogleMobileAdsMediaViewManagerInterface> + U extends + BaseViewManager + & RNGoogleMobileAdsMediaViewManagerInterface> extends BaseViewManagerDelegate { public RNGoogleMobileAdsMediaViewManagerDelegate(U viewManager) { super(viewManager); diff --git a/android/src/oldarch/com/facebook/react/viewmanagers/RNGoogleMobileAdsNativeViewManagerDelegate.java b/android/src/oldarch/com/facebook/react/viewmanagers/RNGoogleMobileAdsNativeViewManagerDelegate.java index 7123cb1d..a9c54fbd 100644 --- a/android/src/oldarch/com/facebook/react/viewmanagers/RNGoogleMobileAdsNativeViewManagerDelegate.java +++ b/android/src/oldarch/com/facebook/react/viewmanagers/RNGoogleMobileAdsNativeViewManagerDelegate.java @@ -10,7 +10,9 @@ public class RNGoogleMobileAdsNativeViewManagerDelegate< T extends View, - U extends BaseViewManager & RNGoogleMobileAdsNativeViewManagerInterface> + U extends + BaseViewManager + & RNGoogleMobileAdsNativeViewManagerInterface> extends BaseViewManagerDelegate { public RNGoogleMobileAdsNativeViewManagerDelegate(U viewManager) { super(viewManager);