Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: migrate to sdk v9 (ios), upgrade to sdk 20.6.0 (android) #115

Merged
merged 3 commits into from
Apr 19, 2022
Merged

feat: migrate to sdk v9 (ios), upgrade to sdk 20.6.0 (android) #115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9456bb4
feat(ios, sdk): migrate to mobile ads sdk v9
dylancom Apr 19, 2022
13e3dfe
feat(android, sdk): update to google mobile ads sdk 20.6.0
mikehardy Apr 19, 2022
c3c74ad
chore(example): result of refresh-example script run w/new SDKs
mikehardy Apr 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 0 additions & 11 deletions android/src/main/java/io/invertase/googlemobileads/ReactNativeGoogleMobileAdsCommon.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,11 @@
*
*/

import android.location.Location;
import android.os.Bundle;
import android.util.DisplayMetrics;
import android.view.Display;
import com.facebook.react.bridge.Arguments;
import com.facebook.react.bridge.ReactContext;
import com.facebook.react.bridge.ReadableArray;
import com.facebook.react.bridge.ReadableMap;
import com.facebook.react.bridge.WritableMap;
import com.facebook.react.views.view.ReactViewGroup;
Expand Down Expand Up @@ -165,15 +163,6 @@ public static AdManagerAdRequest buildAdRequest(ReadableMap adRequestOptions) {
builder.setContentUrl(Objects.requireNonNull(adRequestOptions.getString("contentUrl")));
}

if (adRequestOptions.hasKey("location")) {
ReadableArray locationArray = adRequestOptions.getArray("location");
Location location = new Location("");
location.setLatitude(Objects.requireNonNull(locationArray).getDouble(0));
location.setLongitude(Objects.requireNonNull(locationArray).getDouble(1));

builder.setLocation(location);
}

if (adRequestOptions.hasKey("requestAgent")) {
builder.setRequestAgent(Objects.requireNonNull(adRequestOptions.getString("requestAgent")));
}
Expand Down
12 changes: 12 additions & 0 deletions example/android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
apply plugin: "com.android.application"

import com.android.build.OutputFile
import org.apache.tools.ant.taskdefs.condition.Os

/**
* The react.gradle file registers a task for each build variant (e.g. bundleDebugJsAndAssets
Expand Down Expand Up @@ -159,6 +160,17 @@ android {
// Make sure this target name is the same you specify inside the
// src/main/jni/Android.mk file for the `LOCAL_MODULE` variable.
targets "example_appmodules"

// Fix for windows limit on number of character in file paths and in command lines
if (Os.isFamily(Os.FAMILY_WINDOWS)) {
arguments "NDK_OUT=${rootProject.projectDir.getParent()}\\.cxx",
"NDK_APP_SHORT_COMMANDS=true"
}
}
}
if (!enableSeparateBuildPerCPUArchitecture) {
ndk {
abiFilters (*reactNativeArchitectures())
}
}
}
Expand Down
15 changes: 14 additions & 1 deletion example/android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import org.apache.tools.ant.taskdefs.condition.Os

// Top-level build file where you can add configuration options common to all sub-projects/modules.

buildscript {
Expand All @@ -7,7 +9,18 @@ buildscript {
minSdkVersion = 21
compileSdkVersion = 31
targetSdkVersion = 31
ndkVersion = "21.4.7075529"

if (System.properties['os.arch'] == "aarch64") {
// For M1 Users we need to use the NDK 24 which added support for aarch64
ndkVersion = "24.0.8215888"
} else if (Os.isFamily(Os.FAMILY_WINDOWS)) {
// For Android Users, we need to use NDK 23, otherwise the build will
// fail due to paths longer than the OS limit
ndkVersion = "23.1.7779620"
} else {
// Otherwise we default to the side-by-side NDK version from AGP.
ndkVersion = "21.4.7075529"
}
}
repositories {
google()
Expand Down
Loading