Skip to content

Commit 2587196

Browse files
authored
feat(): support v7 (#339)
1 parent a95cd79 commit 2587196

32 files changed

+4371
-7027
lines changed

.github/workflows/validation.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
- uses: actions/checkout@v3
1414
- uses: actions/setup-node@v3
1515
with:
16-
node-version: 18
16+
node-version: 20
1717
- run: npm install
1818
- run: npm run lint
1919

@@ -23,7 +23,7 @@ jobs:
2323
- uses: actions/checkout@v3
2424
- uses: actions/setup-node@v3
2525
with:
26-
node-version: 18
26+
node-version: 20
2727
- run: npm install
2828
- run: npm run lint
2929

@@ -33,22 +33,22 @@ jobs:
3333
- uses: actions/checkout@v3
3434
- uses: actions/setup-node@v3
3535
with:
36-
node-version: 18
36+
node-version: 20
3737
- run: npm install
3838
- run: npm run verify:web
3939

4040
verify-android:
4141
runs-on: ubuntu-latest
4242
steps:
43-
- name: set up JDK 17
43+
- name: set up JDK 21
4444
uses: actions/setup-java@v3
4545
with:
46-
java-version: '17'
46+
java-version: '21'
4747
distribution: 'zulu'
4848
- uses: actions/checkout@v3
4949
- uses: actions/setup-node@v3
5050
with:
51-
node-version: 18
51+
node-version: 20
5252
# - run: npm install
5353
# - run: npm run verify:android
5454

@@ -58,5 +58,5 @@ jobs:
5858
- uses: actions/checkout@v3
5959
- uses: actions/setup-node@v3
6060
with:
61-
node-version: 18
61+
node-version: 20
6262
- run: npm run verify:ios

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 = '13.0'
14+
s.ios.deployment_target = '14.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(.v13)],
6+
platforms: [.iOS(.v14)],
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: "6.0.0"),
13+
.package(url: "https://github.com/ionic-team/capacitor-swift-pm.git", from: "7.0.0"),
1414
.package(url: "https://github.com/googleads/swift-package-manager-google-mobile-ads.git", branch: "main")
1515
],
1616
targets: [

README.md

Lines changed: 85 additions & 58 deletions
Large diffs are not rendered by default.

android/build.gradle

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
ext {
22
junitVersion = project.hasProperty('junitVersion') ? rootProject.ext.junitVersion : '4.13.2'
3-
androidxAppCompatVersion = project.hasProperty('androidxAppCompatVersion') ? rootProject.ext.androidxAppCompatVersion : '1.6.1'
3+
androidxAppCompatVersion = project.hasProperty('androidxAppCompatVersion') ? rootProject.ext.androidxAppCompatVersion : '1.7.0'
44
androidxCoordinatorLayoutVersion = project.hasProperty('androidxCoordinatorLayoutVersion') ? rootProject.ext.androidxCoordinatorLayoutVersion : '1.2.0'
5-
androidxJunitVersion = project.hasProperty('androidxJunitVersion') ? rootProject.ext.androidxJunitVersion : '1.1.5'
6-
androidxEspressoCoreVersion = project.hasProperty('androidxEspressoCoreVersion') ? rootProject.ext.androidxEspressoCoreVersion : '3.5.1'
5+
androidxJunitVersion = project.hasProperty('androidxJunitVersion') ? rootProject.ext.androidxJunitVersion : '1.2.1'
6+
androidxEspressoCoreVersion = project.hasProperty('androidxEspressoCoreVersion') ? rootProject.ext.androidxEspressoCoreVersion : '3.6.1'
77
playServicesAdsVersion = project.hasProperty('playServicesAdsVersion') ? rootProject.ext.playServicesAdsVersion : '23.0.0'
88
androidxCoreKTXVersion = project.hasProperty('androidxCoreKTXVersion') ? rootProject.ext.androidxCoreKTXVersion : '1.13.0'
99
}
1010

1111
buildscript {
12-
ext.kotlin_version = project.hasProperty("kotlin_version") ? rootProject.ext.kotlin_version : '1.9.10'
12+
ext.kotlin_version = project.hasProperty("kotlin_version") ? rootProject.ext.kotlin_version : '1.9.25'
1313
repositories {
1414
google()
1515
mavenCentral()
1616
}
1717
dependencies {
18-
classpath 'com.android.tools.build:gradle:8.2.1'
18+
classpath 'com.android.tools.build:gradle:8.7.2'
1919
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
2020
}
2121
}
@@ -25,10 +25,10 @@ apply plugin: 'kotlin-android'
2525

2626
android {
2727
namespace "com.getcapacitor.community.admob.admob"
28-
compileSdk project.hasProperty('compileSdkVersion') ? rootProject.ext.compileSdkVersion : 34
28+
compileSdk project.hasProperty('compileSdkVersion') ? rootProject.ext.compileSdkVersion : 35
2929
defaultConfig {
30-
minSdkVersion project.hasProperty('minSdkVersion') ? rootProject.ext.minSdkVersion : 22
31-
targetSdkVersion project.hasProperty('targetSdkVersion') ? rootProject.ext.targetSdkVersion : 34
30+
minSdkVersion project.hasProperty('minSdkVersion') ? rootProject.ext.minSdkVersion : 23
31+
targetSdkVersion project.hasProperty('targetSdkVersion') ? rootProject.ext.targetSdkVersion : 35
3232
versionCode 1
3333
versionName "1.0"
3434
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -43,11 +43,11 @@ android {
4343
abortOnError false
4444
}
4545
compileOptions {
46-
sourceCompatibility JavaVersion.VERSION_17
47-
targetCompatibility JavaVersion.VERSION_17
46+
sourceCompatibility JavaVersion.VERSION_21
47+
targetCompatibility JavaVersion.VERSION_21
4848
}
4949
kotlinOptions {
50-
jvmTarget = JavaVersion.VERSION_17
50+
jvmTarget = JavaVersion.VERSION_21
5151
}
5252
}
5353

-19.3 KB
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.2.1-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-all.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

android/gradlew

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

android/gradlew.bat

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

demo/angular/android/app/capacitor.build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
android {
44
compileOptions {
5-
sourceCompatibility JavaVersion.VERSION_17
6-
targetCompatibility JavaVersion.VERSION_17
5+
sourceCompatibility JavaVersion.VERSION_21
6+
targetCompatibility JavaVersion.VERSION_21
77
}
88
}
99

0 commit comments

Comments
 (0)