Skip to content

Commit b8168fa

Browse files
authored
feat: support v8 (#403)
1 parent ae95dba commit b8168fa

File tree

28 files changed

+5919
-6409
lines changed

28 files changed

+5919
-6409
lines changed

.github/workflows/validation.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
- run: npm run verify:android
5454

5555
verify-ios:
56-
runs-on: macos-14
56+
runs-on: macos-15
5757
steps:
5858
- uses: actions/checkout@v3
5959
- uses: actions/setup-node@v3

CapacitorCommunityAdmob.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Pod::Spec.new do |s|
1111
s.author = package['author']
1212
s.source = { :git => package['repository']['url'], :tag => s.version.to_s }
1313
s.source_files = 'ios/Sources/**/*.{swift,h,m,c,cc,mm,cpp}'
14-
s.ios.deployment_target = '14.0'
14+
s.ios.deployment_target = '15.0'
1515
s.swift_version = '5.1'
1616
s.static_framework = true
1717
s.dependency 'Capacitor'

Package.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ import PackageDescription
33

44
let package = Package(
55
name: "CapacitorCommunityAdmob",
6-
platforms: [.iOS(.v14)],
6+
platforms: [.iOS(.v15)],
77
products: [
88
.library(
99
name: "CapacitorCommunityAdmob",
1010
targets: ["AdMobPlugin"])
1111
],
1212
dependencies: [
13-
.package(url: "https://github.com/ionic-team/capacitor-swift-pm.git", from: "7.0.0"),
13+
.package(url: "https://github.com/ionic-team/capacitor-swift-pm.git", from: "8.0.0"),
1414
.package(url: "https://github.com/googleads/swift-package-manager-google-mobile-ads.git", from: "12.12.0"),
1515
.package(url: "https://github.com/googleads/swift-package-manager-google-user-messaging-platform.git", from: "3.0.0")
1616
],

android/build.gradle

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,21 @@ ext {
22
junitVersion = project.hasProperty('junitVersion') ? rootProject.ext.junitVersion : '4.13.2'
33
androidxAppCompatVersion = project.hasProperty('androidxAppCompatVersion') ? rootProject.ext.androidxAppCompatVersion : '1.7.1'
44
androidxCoordinatorLayoutVersion = project.hasProperty('androidxCoordinatorLayoutVersion') ? rootProject.ext.androidxCoordinatorLayoutVersion : '1.3.0'
5-
androidxJunitVersion = project.hasProperty('androidxJunitVersion') ? rootProject.ext.androidxJunitVersion : '1.2.1'
6-
androidxEspressoCoreVersion = project.hasProperty('androidxEspressoCoreVersion') ? rootProject.ext.androidxEspressoCoreVersion : '3.6.1'
5+
androidxJunitVersion = project.hasProperty('androidxJunitVersion') ? rootProject.ext.androidxJunitVersion : '1.3.0'
6+
androidxEspressoCoreVersion = project.hasProperty('androidxEspressoCoreVersion') ? rootProject.ext.androidxEspressoCoreVersion : '3.7.0'
77
playServicesAdsVersion = project.hasProperty('playServicesAdsVersion') ? rootProject.ext.playServicesAdsVersion : '24.7.+'
88
userMessagingPlatformVersion = project.hasProperty('userMessagingPlatformVersion') ? rootProject.ext.userMessagingPlatformVersion : '3.1.0'
99
androidxCoreKTXVersion = project.hasProperty('androidxCoreKTXVersion') ? rootProject.ext.androidxCoreKTXVersion : '1.15.0'
1010
}
1111

1212
buildscript {
13-
ext.kotlin_version = project.hasProperty("kotlin_version") ? rootProject.ext.kotlin_version : '2.1.20'
13+
ext.kotlin_version = project.hasProperty("kotlin_version") ? rootProject.ext.kotlin_version : '2.2.20'
1414
repositories {
1515
google()
1616
mavenCentral()
1717
}
1818
dependencies {
19-
classpath 'com.android.tools.build:gradle:8.7.2'
19+
classpath 'com.android.tools.build:gradle:8.13.0'
2020
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
2121
}
2222
}
@@ -25,11 +25,11 @@ apply plugin: 'com.android.library'
2525
apply plugin: 'kotlin-android'
2626

2727
android {
28-
namespace "com.getcapacitor.community.admob.admob"
29-
compileSdk project.hasProperty('compileSdkVersion') ? rootProject.ext.compileSdkVersion : 35
28+
namespace = "com.getcapacitor.community.admob.admob"
29+
compileSdk = project.hasProperty('compileSdkVersion') ? rootProject.ext.compileSdkVersion : 36
3030
defaultConfig {
31-
minSdkVersion project.hasProperty('minSdkVersion') ? rootProject.ext.minSdkVersion : 23
32-
targetSdkVersion project.hasProperty('targetSdkVersion') ? rootProject.ext.targetSdkVersion : 35
31+
minSdkVersion project.hasProperty('minSdkVersion') ? rootProject.ext.minSdkVersion : 24
32+
targetSdkVersion project.hasProperty('targetSdkVersion') ? rootProject.ext.targetSdkVersion : 36
3333
versionCode 1
3434
versionName "1.0"
3535
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -41,7 +41,7 @@ android {
4141
}
4242
}
4343
lintOptions {
44-
abortOnError false
44+
abortOnError = false
4545
}
4646
compileOptions {
4747
sourceCompatibility JavaVersion.VERSION_21
181 Bytes
Binary file not shown.

android/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-all.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

android/gradlew

Lines changed: 4 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

android/gradlew.bat

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

android/src/main/java/com/getcapacitor/community/admob/consent/AdConsentExecutor.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public void requestConsentInfo(final PluginCall call, BiConsumer<String, JSObjec
7171
consentInfo.put("privacyOptionsRequirementStatus", consentInformation.getPrivacyOptionsRequirementStatus().name());
7272
call.resolve(consentInfo);
7373
},
74-
formError -> call.reject(formError.getMessage())
74+
(formError) -> call.reject(formError.getMessage())
7575
);
7676
} catch (Exception ex) {
7777
call.reject(ex.getLocalizedMessage(), ex);
@@ -88,7 +88,7 @@ public void showPrivacyOptionsForm(final PluginCall call, BiConsumer<String, JSO
8888
}
8989
ensureConsentInfo();
9090
activity.runOnUiThread(() ->
91-
UserMessagingPlatform.showPrivacyOptionsForm(activity, formError -> {
91+
UserMessagingPlatform.showPrivacyOptionsForm(activity, (formError) -> {
9292
if (formError != null) {
9393
call.reject("Error when show privacy form", formError.getMessage());
9494
} else {
@@ -112,7 +112,7 @@ public void showConsentForm(final PluginCall call, BiConsumer<String, JSObject>
112112

113113
ensureConsentInfo();
114114
activity.runOnUiThread(() ->
115-
UserMessagingPlatform.loadAndShowConsentFormIfRequired(activity, formError -> {
115+
UserMessagingPlatform.loadAndShowConsentFormIfRequired(activity, (formError) -> {
116116
if (formError != null) {
117117
call.reject("Error when show consent form", formError.getMessage());
118118
return;

android/src/test/java/com/getcapacitor/community/admob/consent/AdConsentExecutorTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ void beforeEach() {
6262

6363
adConsentExecutor = new AdConsentExecutor(() -> contextMock, () -> activityMock, notifierMock, LOG_TAG);
6464

65-
doAnswer(invocation -> {
65+
doAnswer((invocation) -> {
6666
Runnable runnable = invocation.getArgument(0);
6767
runnable.run();
6868
return null;

0 commit comments

Comments
 (0)