Skip to content

Commit 902b592

Browse files
committed
Merge branch 'feat/v3' into feat/v3_scheme
2 parents d67eb7b + 2406c11 commit 902b592

File tree

8 files changed

+2613
-1802
lines changed

8 files changed

+2613
-1802
lines changed

CapacitorCommunityAdmob.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@ Pod::Spec.new do |s|
1515
s.swift_version = '5.1'
1616
s.static_framework = true
1717
s.dependency 'Capacitor'
18-
s.dependency 'Google-Mobile-Ads-SDK', '>= 7.64.0'
18+
s.dependency 'Google-Mobile-Ads-SDK', '7.69.0'
1919
end

demo/angular/android/app/src/main/java/io/ionic/starter/MainActivity.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,5 @@ public class MainActivity extends BridgeActivity {
88
public void onCreate(Bundle savedInstanceState) {
99
super.onCreate(savedInstanceState);
1010
registerPlugin(com.getcapacitor.community.admob.AdMob.class);
11-
1211
}
1312
}

demo/angular/ios/App/App.xcodeproj/project.pbxproj

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,6 @@
102102
buildConfigurationList = 504EC3161FED79650016851F /* Build configuration list for PBXNativeTarget "App" */;
103103
buildPhases = (
104104
6634F4EFEBD30273BCE97C65 /* [CP] Check Pods Manifest.lock */,
105-
1B2B57CE95F81F53F5DBDE6A /* [CP] Prepare Artifacts */,
106105
504EC3001FED79650016851F /* Sources */,
107106
504EC3011FED79650016851F /* Frameworks */,
108107
504EC3021FED79650016851F /* Resources */,
@@ -168,21 +167,6 @@
168167
/* End PBXResourcesBuildPhase section */
169168

170169
/* Begin PBXShellScriptBuildPhase section */
171-
1B2B57CE95F81F53F5DBDE6A /* [CP] Prepare Artifacts */ = {
172-
isa = PBXShellScriptBuildPhase;
173-
buildActionMask = 2147483647;
174-
files = (
175-
);
176-
inputPaths = (
177-
);
178-
name = "[CP] Prepare Artifacts";
179-
outputPaths = (
180-
);
181-
runOnlyForDeploymentPostprocessing = 0;
182-
shellPath = /bin/sh;
183-
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-App/Pods-App-artifacts.sh\"\n";
184-
showEnvVarsInLog = 0;
185-
};
186170
6634F4EFEBD30273BCE97C65 /* [CP] Check Pods Manifest.lock */ = {
187171
isa = PBXShellScriptBuildPhase;
188172
buildActionMask = 2147483647;

demo/angular/package-lock.json

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

demo/angular/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
"@angular/compiler": "~11.0.5",
3939
"@angular/compiler-cli": "~11.0.5",
4040
"@angular/language-service": "~11.0.5",
41-
"@capacitor/cli": "3.0.0-beta.2",
41+
"@capacitor/cli": "../../node_modules/@capacitor/cli",
4242
"@ionic/angular-toolkit": "^2.3.0",
4343
"@types/jasmine": "~3.5.0",
4444
"@types/jasminewd2": "~2.0.3",

ios/Podfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ end
99

1010
target 'Plugin' do
1111
capacitor_pods
12-
pod 'Google-Mobile-Ads-SDK', '~> 8.0.0'
12+
pod 'Google-Mobile-Ads-SDK', '7.69.0'
1313
end
1414

1515
target 'PluginTests' do
1616
capacitor_pods
17-
pod 'Google-Mobile-Ads-SDK', '~> 8.0.0'
17+
pod 'Google-Mobile-Ads-SDK', '7.69.0'
1818
end

0 commit comments

Comments
 (0)