Merge branch 'main' into prepRelease510

googleads · Apr 18, 2024 · 510a05f · 510a05f
2 parents c6f31a8 + 9b86f13
commit 510a05f
Show file tree

Hide file tree

Showing 330 changed files with 8,966 additions and 14 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -30,7 +30,7 @@ jobs:
         - "samples/admob/rewarded_example"
         - "samples/admob/rewarded_interstitial_example"   
     steps:
-      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
+      - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633
         with:
           fetch-depth: 0
       - name: "Install Flutter"
@@ -62,7 +62,7 @@ jobs:
         - "samples/admob/rewarded_example"
         - "samples/admob/rewarded_interstitial_example" 
     steps:
-      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
+      - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633
         with:
           fetch-depth: 0  
       - name: "Install Flutter"
@@ -95,7 +95,7 @@ jobs:
         - "samples/admob/rewarded_example"
         - "samples/admob/rewarded_interstitial_example" 
     steps:
-      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
+      - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633
         with:
           fetch-depth: 0
       - name: "Install Flutter"

diff --git a/.github/workflows/gma_mediation_applovin.yaml b/.github/workflows/gma_mediation_applovin.yaml
@@ -23,15 +23,15 @@ on:
       - "packages/mediation/gma_mediation_applovin/android/**"
   push:
     branches:
-      - master
+      - main
 
 jobs:
   android:
     runs-on: macos-latest
     if: github.event_name == 'pull_request'
     timeout-minutes: 30
     steps:
-      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
+      - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633
         with:
           fetch-depth: 0
       - uses: actions/setup-java@v4
@@ -53,10 +53,10 @@ jobs:
     runs-on: macos-latest
     timeout-minutes: 40
     steps:
-      - uses: swift-actions/setup-swift@v1
+      - uses: swift-actions/setup-swift@v2
         with:
           swift-version: "5.7.2"
-      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
+      - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633
         with:
           fetch-depth: 0
       - name: "Install Flutter"
@@ -82,7 +82,7 @@ jobs:
     if: github.event_name == 'pull_request'
     timeout-minutes: 30
     steps:
-      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
+      - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633
         with:
           fetch-depth: 0
       - name: "Install Flutter"

diff --git a/.github/workflows/gma_mediation_dtexchange.yaml b/.github/workflows/gma_mediation_dtexchange.yaml
@@ -0,0 +1,53 @@
+#  Copyright 2024 Google LLC
+#
+#  Licensed under the Apache License, Version 2.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at
+#
+#  https://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+
+name: gma_mediation_dtexchange
+
+on:
+  pull_request:
+    paths:
+    - "packages/mediation/gma_mediation_dtexchange/**"
+    - ".github/workflows/gma_mediation_dtexchange.yaml"
+    - "packages/mediation/gma_mediation_dtexchange/ios/**"
+    - "packages/mediation/gma_mediation_dtexchange/android/**"
+  push:
+    branches:
+    - main
+
+jobs:
+  flutter:
+    runs-on: ubuntu-latest
+    if: github.event_name == 'pull_request'
+    timeout-minutes: 30
+    steps:
+    - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
+      with:
+        fetch-depth: 0
+    - name: "Install Flutter"
+      run: ./.github/workflows/scripts/install-flutter.sh stable
+    - name: "Install Tools"
+      run: ./.github/workflows/scripts/install-tools.sh
+    - name: "Flutter Analyze"
+      run: |
+        cd packages/mediation/gma_mediation_dtexchange
+        flutter analyze
+    - name: "Flutter Publish"
+      run: |
+        cd packages/mediation/gma_mediation_dtexchange
+        flutter pub publish --dry-run
+    - name: "Flutter Format"
+      run: |
+        flutter pub global activate flutter_plugin_tools
+        flutter pub global run flutter_plugin_tools format
+        ./.github/workflows/scripts/validate-formatting.sh
diff --git a/.github/workflows/gma_mediation_inmobi.yaml b/.github/workflows/gma_mediation_inmobi.yaml
@@ -0,0 +1,53 @@
+#  Copyright 2024 Google LLC
+#
+#  Licensed under the Apache License, Version 2.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at
+#
+#  https://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+
+name: gma_mediation_inmobi
+
+on:
+  pull_request:
+    paths:
+    - "packages/mediation/gma_mediation_inmobi/**"
+    - ".github/workflows/gma_mediation_inmobi.yaml"
+    - "packages/mediation/gma_mediation_inmobi/ios/**"
+    - "packages/mediation/gma_mediation_inmobi/android/**"
+  push:
+    branches:
+    - main
+
+jobs:
+  flutter:
+    runs-on: ubuntu-latest
+    if: github.event_name == 'pull_request'
+    timeout-minutes: 30
+    steps:
+    - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
+      with:
+        fetch-depth: 0
+    - name: "Install Flutter"
+      run: ./.github/workflows/scripts/install-flutter.sh stable
+    - name: "Install Tools"
+      run: ./.github/workflows/scripts/install-tools.sh
+    - name: "Flutter Analyze"
+      run: |
+        cd packages/mediation/gma_mediation_inmobi
+        flutter analyze
+    - name: "Flutter Publish"
+      run: |
+        cd packages/mediation/gma_mediation_inmobi
+        flutter pub publish --dry-run
+    - name: "Flutter Format"
+      run: |
+        flutter pub global activate flutter_plugin_tools
+        flutter pub global run flutter_plugin_tools format
+        ./.github/workflows/scripts/validate-formatting.sh
diff --git a/.github/workflows/gma_mediation_ironsource.yaml b/.github/workflows/gma_mediation_ironsource.yaml
@@ -0,0 +1,53 @@
+#  Copyright 2024 Google LLC
+#
+#  Licensed under the Apache License, Version 2.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at
+#
+#  https://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+
+name: gma_mediation_ironsource
+
+on:
+  pull_request:
+    paths:
+    - "packages/mediation/gma_mediation_ironsource/**"
+    - ".github/workflows/gma_mediation_ironsource.yaml"
+    - "packages/mediation/gma_mediation_ironsource/ios/**"
+    - "packages/mediation/gma_mediation_ironsource/android/**"
+  push:
+    branches:
+    - main
+
+jobs:
+  flutter:
+    runs-on: ubuntu-latest
+    if: github.event_name == 'pull_request'
+    timeout-minutes: 30
+    steps:
+    - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
+      with:
+        fetch-depth: 0
+    - name: "Install Flutter"
+      run: ./.github/workflows/scripts/install-flutter.sh stable
+    - name: "Install Tools"
+      run: ./.github/workflows/scripts/install-tools.sh
+    - name: "Flutter Analyze"
+      run: |
+        cd packages/mediation/gma_mediation_ironsource
+        flutter analyze
+    - name: "Flutter Publish"
+      run: |
+        cd packages/mediation/gma_mediation_ironsource
+        flutter pub publish --dry-run
+    - name: "Flutter Format"
+      run: |
+        flutter pub global activate flutter_plugin_tools
+        flutter pub global run flutter_plugin_tools format
+        ./.github/workflows/scripts/validate-formatting.sh
diff --git a/.github/workflows/gma_mediation_meta.yaml b/.github/workflows/gma_mediation_meta.yaml
@@ -0,0 +1,53 @@
+#  Copyright 2024 Google LLC
+#
+#  Licensed under the Apache License, Version 2.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at
+#
+#  https://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+
+name: gma_mediation_meta
+
+on:
+  pull_request:
+    paths:
+    - "packages/mediation/gma_mediation_meta/**"
+    - ".github/workflows/gma_mediation_meta.yaml"
+    - "packages/mediation/gma_mediation_meta/ios/**"
+    - "packages/mediation/gma_mediation_meta/android/**"
+  push:
+    branches:
+    - main
+
+jobs:
+  flutter:
+    runs-on: ubuntu-latest
+    if: github.event_name == 'pull_request'
+    timeout-minutes: 30
+    steps:
+    - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
+      with:
+        fetch-depth: 0
+    - name: "Install Flutter"
+      run: ./.github/workflows/scripts/install-flutter.sh stable
+    - name: "Install Tools"
+      run: ./.github/workflows/scripts/install-tools.sh
+    - name: "Flutter Analyze"
+      run: |
+        cd packages/mediation/gma_mediation_meta
+        flutter analyze
+    - name: "Flutter Publish"
+      run: |
+        cd packages/mediation/gma_mediation_meta
+        flutter pub publish --dry-run
+    - name: "Flutter Format"
+      run: |
+        flutter pub global activate flutter_plugin_tools
+        flutter pub global run flutter_plugin_tools format
+        ./.github/workflows/scripts/validate-formatting.sh
diff --git a/.github/workflows/gma_mediation_pangle.yaml b/.github/workflows/gma_mediation_pangle.yaml
@@ -0,0 +1,53 @@
+#  Copyright 2024 Google LLC
+#
+#  Licensed under the Apache License, Version 2.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at
+#
+#  https://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+
+name: gma_mediation_pangle
+
+on:
+  pull_request:
+    paths:
+      - "packages/mediation/gma_mediation_pangle/**"
+      - ".github/workflows/gma_mediation_pangle.yaml"
+      - "packages/mediation/gma_mediation_pangle/ios/**"
+      - "packages/mediation/gma_mediation_pangle/android/**"
+  push:
+    branches:
+      - main
+
+jobs:
+  flutter:
+    runs-on: ubuntu-latest
+    if: github.event_name == 'pull_request'
+    timeout-minutes: 30
+    steps:
+      - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633
+        with:
+          fetch-depth: 0
+      - name: "Install Flutter"
+        run: ./.github/workflows/scripts/install-flutter.sh stable
+      - name: "Install Tools"
+        run: ./.github/workflows/scripts/install-tools.sh
+      - name: "Flutter Analyze"
+        run: |
+          cd packages/mediation/gma_mediation_pangle/
+          flutter analyze
+      - name: "Flutter Publish"
+        run: |
+          cd packages/mediation/gma_mediation_pangle/
+          flutter pub publish --dry-run
+      - name: "Flutter Format"
+        run: |
+          flutter pub global activate flutter_plugin_tools
+          flutter pub global run flutter_plugin_tools format
+          ./.github/workflows/scripts/validate-formatting.sh
diff --git a/.github/workflows/google_mobile_ads.yaml b/.github/workflows/google_mobile_ads.yaml
@@ -23,7 +23,7 @@ on:
       - "packages/google_mobile_ads/android/**"
   push:
     branches:
-      - master
+      - main
 
 env:
   GOOGLEMOBILEADS_PLUGIN_SCOPE: "*google_mobile_ads*"
@@ -34,7 +34,7 @@ jobs:
     if: github.event_name == 'pull_request'
     timeout-minutes: 30
     steps:
-      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
+      - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633
         with:
           fetch-depth: 0
       - uses: actions/setup-java@v4
@@ -56,7 +56,7 @@ jobs:
     runs-on: macos-latest
     timeout-minutes: 40
     steps:
-      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
+      - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633
         with:
           fetch-depth: 0
       - name: "Install Flutter"
@@ -73,7 +73,7 @@ jobs:
           flutter pub get
           pod install
           xcodebuild -configuration Debug -resultBundlePath TestResults VERBOSE_SCRIPT_LOGGING=YES -workspace Runner.xcworkspace -scheme Runner -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 14 Pro,OS=16.2' test  
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         if: failure()
         with: 
           name: iOSTestResults
@@ -83,7 +83,7 @@ jobs:
     if: github.event_name == 'pull_request'
     timeout-minutes: 30
     steps:
-      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
+      - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633
         with:
           fetch-depth: 0
       - name: "Install Flutter"

diff --git a/analysis_options.yaml b/analysis_options.yaml
@@ -15,7 +15,11 @@
 include: package:pedantic/analysis_options.1.11.0.yaml
 
 analyzer:
-  exclude: [packages/gma_mediation_applovin/**]
+  exclude: [
+    packages/mediation/gma_mediation_applovin/**,
+    packages/mediation/gma_mediation_ironsource/**
+    packages/mediation/gma_mediation_meta/**
+  ]
   errors:
     omit_local_variable_types: ignore