Skip to content

No public description #4059

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

Open
copybara-service wants to merge 1 commit into
base: main
Choose a base branch
from
Open

No public description #4059

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 8 additions & 2 deletions admob_unity_rapid.ncl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@ UNITY_PLUGIN_IOS_FLAGS = [
];

DEFAULT_TARGET_UNITY_VERSION = "6000.3";
// TODO(jochac): Bump to API 36.
DEFAULT_ANDROID_TARGET_SDK = "35";
DEFAULT_ANDROID_TARGET_SDK = "36";
DEFAULT_PROJECT_NAME = "HelloWorld";
DEFAULT_ADMOB_ANDROID_APP_ID = "ca-app-pub-3940256099942544~3347511713";

Expand All @@ -37,6 +36,13 @@ USE_UNITY_PACKAGE_WORKFLOW_PARAMETER = ::Rapid::WorkflowParameter::Bool(
modifiable = true,
description = "Whether the Unity plugin should be imported or tested using the Unity package or the UPM dependency.",
);
TARGET_DECAGON_WORKFLOW_PARAMETER = ::Rapid::WorkflowParameter::Bool(
name = "target_decagon",
label = "Target Decagon",
default_value = false,
modifiable = true,
description = "Whether the Unity plugin should be built for Decagon or Nonagon.",
);
SHARED_BUILD_AND_TEST_WORKFLOW_PARAMETERS = [
::Rapid::WorkflowParameter::SingleSelectEnum(
name = "target_unity_ver",
Expand Down
6 changes: 5 additions & 1 deletion source/plugin/Assets/Plugins/Android/GoogleMobileAdsPlugin.androidlib/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,16 @@ android {
}
}

configurations.all {
exclude group: 'com.google.android.gms', module: 'play-services-ads-api'
}

dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation 'androidx.annotation:annotation:1.7.1'
implementation 'androidx.appcompat:appcompat:1.6.1'
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
implementation 'com.google.android.gms:play-services-ads:24.5.0'
implementation 'com.google.android.libraries.ads.mobile.sdk:ads-mobile-sdk:0.22.0-beta04'
implementation 'com.google.android.ump:user-messaging-platform:3.2.0'
implementation 'androidx.lifecycle:lifecycle-common-java8:2.6.2'
implementation 'androidx.lifecycle:lifecycle-process:2.6.2'
Expand Down