Skip to content

Commit

Permalink
Merge branch 'main' into release/4.9.14.0.1
Browse files Browse the repository at this point in the history
# Conflicts:
#	CHANGELOG.md
#	ChartboostMediationAdapterAdMob.podspec
#	Source/AdMobAdapter.swift
  • Loading branch information
daniel-barros committed May 8, 2023
2 parents 6d68e44 + 7bd9ea7 commit 6c231cc
Show file tree
Hide file tree
Showing 11 changed files with 45 additions and 201 deletions.
27 changes: 27 additions & 0 deletions .github/workflows/create-release-branch.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
name: Create Release Branch

on:
# Manual trigger from the Github Actions tab
workflow_dispatch:
inputs:
adapter-version:
type: string
description: 'Adapter version (e.g. ''4.9.2.0.0'')'
required: true
partner-version:
type: string
description: 'Partner version (e.g. ''~> 9.2.0'')'
required: true
default: '~> '

env:
GITHUB_TOKEN: ${{ secrets.GITHUBSERVICETOKEN }}

jobs:
create-release-branch:
runs-on: macos-latest
steps:
- uses: chartboost/chartboost-mediation-ios-actions/create-adapter-release-branch@v1
with:
adapter-version: ${{ inputs.adapter-version }}
partner-version: ${{ inputs.partner-version }}
40 changes: 0 additions & 40 deletions .github/workflows/release-candidate.yml

This file was deleted.

29 changes: 2 additions & 27 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,31 +12,6 @@ jobs:
release-adapter:
runs-on: macos-latest
steps:
# Check out the repo.
- name: Checkout
uses: actions/checkout@v3

# Obtain the new adapter version.
- name: Obtain Adapter Version
id: release_version
run: echo "version=$(ruby ./Scripts/adapter-version.rb)" >> $GITHUB_OUTPUT
shell: bash

# Push the release tag.
- name: Tag
run: git tag ${{ steps.release_version.outputs.version }} && git push origin ${{ steps.release_version.outputs.version }}
shell: bash

# Push the podspec.
- name: Push Podspec
run: pod trunk push --verbose --allow-warnings

# Create GitHub release.
- name: Create Release
uses: actions/create-release@v1
- uses: chartboost/chartboost-mediation-ios-actions/release-adapter@v1
with:
tag_name: ${{ github.ref }}
release_name: ${{ github.ref }}
body: ''
draft: false
prerelease: false
allow-warnings: true
15 changes: 3 additions & 12 deletions .github/workflows/smoke-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,6 @@ jobs:
validate-podspec:
runs-on: macos-latest
steps:
# Check out the repo.
- name: Checkout
uses: actions/checkout@v3

# Check that the adapter version in the podpsec and in the PartnerAdapter Swift implementation are the same.
- name: Validate Adapter and Podspec Version Match
run: if [ "$(ruby ./Scripts/validate-adapter-version.rb)" != "true" ]; then exit 1; fi
shell: bash

# Validate the podspec.
- name: Validate Podspec
run: pod lib lint --verbose --allow-warnings
- uses: chartboost/chartboost-mediation-ios-actions/adapter-smoke-test@v1
with:
allow-warnings: true
12 changes: 10 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,17 @@
Note the first digit of every adapter version corresponds to the major version of the Chartboost Mediation SDK compatible with that adapter.
Adapters are compatible with any Chartboost Mediation SDK version within that major version.

### 4.9.14.0.1
### 4.10.3.0.1
- Added support for the Rewarded Interstitial ad format.
- This version of the adapters has been certified with Google-Mobile-Ads-SDK 9.14.0.
- This version of the adapters has been certified with Google-Mobile-Ads-SDK 10.3.0

### 4.10.3.0.0
- This version of the adapters has been certified with Google-Mobile-Ads-SDK 10.3.0

### 4.10.1.0.0
- This version of the adapters has been certified with Google-Mobile-Ads-SDK 10.1.0
- Google Mobile Ads SDK will only serve ads on iOS versions >= 12
\(see [Google's release notes\)](https://developers.google.com/admob/ios/rel-notes)

### 4.9.14.0.0
- This version of the adapters has been certified with Google-Mobile-Ads-SDK 9.14.0.
Expand Down
4 changes: 2 additions & 2 deletions ChartboostMediationAdapterAdMob.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |spec|
spec.name = 'ChartboostMediationAdapterAdMob'
spec.version = '4.9.14.0.1'
spec.version = '4.10.3.0.1'
spec.license = { :type => 'MIT', :file => 'LICENSE.md' }
spec.homepage = 'https://github.com/ChartBoost/chartboost-mediation-ios-adapter-admob'
spec.authors = { 'Chartboost' => 'https://www.chartboost.com/' }
Expand All @@ -23,7 +23,7 @@ Pod::Spec.new do |spec|
spec.dependency 'ChartboostMediationSDK', '~> 4.0'

# Partner network SDK and version that this adapter is certified to work with.
spec.dependency 'Google-Mobile-Ads-SDK', '~> 9.14.0'
spec.dependency 'Google-Mobile-Ads-SDK', '~> 10.3.0'

# The partner network SDK is a static framework which requires the static_framework option.
spec.static_framework = true
Expand Down
4 changes: 0 additions & 4 deletions Scripts/adapter-version.rb

This file was deleted.

21 changes: 0 additions & 21 deletions Scripts/add-changelog-entry.rb

This file was deleted.

74 changes: 0 additions & 74 deletions Scripts/common.rb

This file was deleted.

18 changes: 0 additions & 18 deletions Scripts/validate-adapter-version.rb

This file was deleted.

2 changes: 1 addition & 1 deletion Source/AdMobAdapter.swift
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ final class AdMobAdapter: PartnerAdapter {
/// The version of the adapter.
/// It should have either 5 or 6 digits separated by periods, where the first digit is Chartboost Mediation SDK's major version, the last digit is the adapter's build version, and intermediate digits are the partner SDK's version.
/// Format: `<Chartboost Mediation major version>.<Partner major version>.<Partner minor version>.<Partner patch version>.<Partner build version>.<Adapter build version>` where `.<Partner build version>` is optional.
let adapterVersion = "4.9.14.0.1"
let adapterVersion = "4.10.3.0.1"

/// The partner's unique identifier.
let partnerIdentifier = "admob"
Expand Down

0 comments on commit 6c231cc

Please sign in to comment.