Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

FEM-2137 #24

Merged
merged 8 commits into from
Jan 17, 2019
Merged

FEM-2137 #24

merged 8 commits into from
Jan 17, 2019

Conversation

x-NR-x
Copy link
Collaborator

@x-NR-x x-NR-x commented Nov 22, 2018

Updated to IMA SDK v3.8.1
Added the option to register the video controls overlays.
Updated podspec for easier dev/release state.

Updated to IMA SDK v3.8.1
Added the option to register the video controls overlays.
Updated podspec for easier dev/release state.
@x-NR-x x-NR-x self-assigned this Nov 22, 2018
noamtamim
noamtamim previously approved these changes Nov 22, 2018
noamtamim and others added 5 commits December 4, 2018 12:17
Xcode 9 and Cocoapods 1.5.3 issue.
Not needed for Xcode 10 or Cocoapods 1.6.0.beta.2
* develop:
  Taken from v1.2.0: Updated deployment target to 9, required by GoogleAds IMA. Updated PlayKit to required version 3.7.0.
  Added dependency to XCGLogger which is used by PlayKit pod. Xcode 9 and Cocoapods 1.5.3 issue. Not needed for Xcode 10 or Cocoapods 1.6.0.beta.2

# Conflicts:
#	PlayKit_IMA.podspec
* develop:
  Removing the previous commit for the compilation error with bitrate, this is only from GoogleAds-IMA-iOS-SDK 3.8.1
  Updated the podspec to have the new version format.
  FEM-2325 Updated AdClicked event to send the clickThroughUrl if available. (#25)

# Conflicts:
#	PlayKit_IMA.podspec
noamtamim
noamtamim previously approved these changes Dec 24, 2018
* develop:
  FEM-2316 Expose additional IMA ad data (#27)
  FEM-2262 Exposed the 'vastLoadTimeout' in the IMAConfig. (#26)

# Conflicts:
#	IMAConfig.swift
@x-NR-x x-NR-x merged commit 259b349 into develop Jan 17, 2019
@x-NR-x x-NR-x deleted the FEM-2137 branch January 17, 2019 17:01
x-NR-x added a commit that referenced this pull request Jan 21, 2019
* stg/v1.3.0:
  Set to release mode.
  Updated version to 1.3.0 (#28)
  FEM-2137 Added the option to register the video controls overlays. (#24)
  FEM-2316 Expose additional IMA ad data (#27)
  FEM-2262 Exposed the 'vastLoadTimeout' in the IMAConfig. (#26)
  Removing the previous commit for the compilation error with bitrate, this is only from GoogleAds-IMA-iOS-SDK 3.8.1
  Updated the podspec to have the new version format.
  FEM-2325 Updated AdClicked event to send the clickThroughUrl if available. (#25)

# Conflicts:
#	PlayKit_IMA.podspec
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants