Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion CapacitorCommunityAdmob.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@ Pod::Spec.new do |s|
s.swift_version = '5.1'
s.static_framework = true
s.dependency 'Capacitor'
s.dependency 'Google-Mobile-Ads-SDK', '12.7.0'
s.dependency 'Google-Mobile-Ads-SDK', '12.12.0'
s.dependency 'GoogleUserMessagingPlatform', '3.0.0'
end
3 changes: 1 addition & 2 deletions android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ ext {
androidxCoordinatorLayoutVersion = project.hasProperty('androidxCoordinatorLayoutVersion') ? rootProject.ext.androidxCoordinatorLayoutVersion : '1.3.0'
androidxJunitVersion = project.hasProperty('androidxJunitVersion') ? rootProject.ext.androidxJunitVersion : '1.2.1'
androidxEspressoCoreVersion = project.hasProperty('androidxEspressoCoreVersion') ? rootProject.ext.androidxEspressoCoreVersion : '3.6.1'
playServicesAdsVersion = project.hasProperty('playServicesAdsVersion') ? rootProject.ext.playServicesAdsVersion : '24.4.+'
playServicesAdsVersion = project.hasProperty('playServicesAdsVersion') ? rootProject.ext.playServicesAdsVersion : '24.7.+'
userMessagingPlatformVersion = project.hasProperty('userMessagingPlatformVersion') ? rootProject.ext.userMessagingPlatformVersion : '3.1.0'
androidxCoreKTXVersion = project.hasProperty('androidxCoreKTXVersion') ? rootProject.ext.androidxCoreKTXVersion : '1.15.0'
}
Expand Down Expand Up @@ -79,7 +79,6 @@ dependencies {
// androidTestImplementation "androidx.test.ext:junit:$androidxJunitVersion"
// androidTestImplementation "androidx.test.espresso:espresso-core:$androidxEspressoCoreVersion"

// after 20.5.0, require minCompileSdk (31)
implementation "com.google.android.gms:play-services-ads:$playServicesAdsVersion"
implementation "com.google.android.ump:user-messaging-platform:$userMessagingPlatformVersion"
implementation "androidx.appcompat:appcompat:$androidxAppCompatVersion"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,4 +43,12 @@ internal class InterstitialAdStub: InterstitialAd() {
TODO("Not yet implemented")
}

override fun getPlacementId(): Long {
return 0L
}

override fun setPlacementId(p0: Long) {
TODO("Not yet implemented")
}

}
2 changes: 1 addition & 1 deletion ios/Sources/AdMobPlugin/Banner/BannerExecutor.swift
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ class BannerExecutor: NSObject, BannerViewDelegate {
attribute: self.adPosition == "TOP_CENTER" ? .top : .bottom,
multiplier: 1,
constant: CGFloat(Int(self.Margin) * -1)),
NSLayoutConstraint(item: bannerView,
NSLayoutConstraint(item: bannerView,
attribute: .centerX,
relatedBy: .equal,
toItem: rootViewController.view,
Expand Down
4 changes: 2 additions & 2 deletions ios/Sources/AdMobPlugin/Consent/ConsentExecutor.swift
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ class ConsentExecutor: NSObject {
guard let rootViewController = plugin?.getRootVC() else {
return call.reject("No ViewController")
}

Task {
do {
try await ConsentForm.presentPrivacyOptionsForm(from: rootViewController)
Expand Down Expand Up @@ -92,7 +92,7 @@ class ConsentExecutor: NSObject {
return "UNKNOWN"
}
}

func getPrivacyOptionsRequirementStatus(_ requirementStatus: PrivacyOptionsRequirementStatus) -> String {
switch requirementStatus {
case PrivacyOptionsRequirementStatus.required:
Expand Down