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

SP-7877 ott UI testing #355

Merged
merged 22 commits into from
Feb 3, 2022
Merged

SP-7877 ott UI testing #355

merged 22 commits into from
Feb 3, 2022

Conversation

Nevazhnovu
Copy link
Collaborator

No description provided.

andresilveirah and others added 4 commits January 28, 2022 15:19
* develop:
  update CHANGELOG
  update XCFramework
  bump version to 6.4.1
  move Objc project to cocoapods
  update spm version for SPMBuild Target
  add build SPM step to github test workflow
  import UIKit on Constants to fix SPM build
  namespace URL constants
  fix linting and namespace UI constants
  create SPMBuild app
  update XCFramework
  run pod install
  bump version to 6.4.0
  run pod install
  update CHANGELOG

# Conflicts:
#	Example/ConsentViewController.xcodeproj/project.pbxproj
#	Example/Podfile
#	Example/Podfile.lock
#	Example/Pods/Manifest.lock
#	Example/Pods/Pods.xcodeproj/project.pbxproj
#	Example/Pods/Target Support Files/Pods-ConsentViewController_ExampleTests/Pods-ConsentViewController_ExampleTests.debug.xcconfig
#	Example/Pods/Target Support Files/Pods-ConsentViewController_ExampleTests/Pods-ConsentViewController_ExampleTests.release.xcconfig
#	Example/Pods/Target Support Files/Pods-NativeMessageExampleUITests/Pods-NativeMessageExampleUITests.debug.xcconfig
#	Example/Pods/Target Support Files/Pods-NativeMessageExampleUITests/Pods-NativeMessageExampleUITests.release.xcconfig
#	Example/Pods/Target Support Files/Pods-ObjC-ExampleAppUITests/Pods-ObjC-ExampleAppUITests-frameworks-Debug-input-files.xcfilelist
#	Example/Pods/Target Support Files/Pods-ObjC-ExampleAppUITests/Pods-ObjC-ExampleAppUITests-frameworks-Release-input-files.xcfilelist
#	Example/Pods/Target Support Files/Pods-ObjC-ExampleAppUITests/Pods-ObjC-ExampleAppUITests-frameworks.sh
#	Example/Pods/Target Support Files/Pods-ObjC-ExampleAppUITests/Pods-ObjC-ExampleAppUITests.debug.xcconfig
#	Example/Pods/Target Support Files/Pods-ObjC-ExampleAppUITests/Pods-ObjC-ExampleAppUITests.release.xcconfig
#	Example/Pods/Target Support Files/Pods-SPGDPRExampleAppUITests/Pods-SPGDPRExampleAppUITests.debug.xcconfig
#	Example/Pods/Target Support Files/Pods-SPGDPRExampleAppUITests/Pods-SPGDPRExampleAppUITests.release.xcconfig
#	Example/Pods/Target Support Files/Pods-SourcePointMetaAppUITests/Pods-SourcePointMetaAppUITests.debug.xcconfig
#	Example/Pods/Target Support Files/Pods-SourcePointMetaAppUITests/Pods-SourcePointMetaAppUITests.release.xcconfig
@Nevazhnovu Nevazhnovu merged commit 0013b8f into develop Feb 3, 2022
Nevazhnovu added a commit that referenced this pull request Feb 4, 2022
* develop:
  SP-7877 ott UI testing (#355)
  update CHANGELOG
  update XCFramework
  bump version to 6.4.1
  move Objc project to cocoapods
  update spm version for SPMBuild Target
  add build SPM step to github test workflow
  import UIKit on Constants to fix SPM build
  namespace URL constants
  fix linting and namespace UI constants
  create SPMBuild app
  update XCFramework
  run pod install
  bump version to 6.4.0
  run pod install
  update CHANGELOG
  SP-8555 tv os native message logo (#358)

# Conflicts:
#	ConsentViewController/Classes/Constants.swift
#	ConsentViewController/Classes/SourcePointClient/GDPRPrivacyManagerViewResponse.swift
#	ConsentViewController/Classes/SourcePointClient/SPNativeUI.swift
#	ConsentViewController/Classes/SourcePointClient/SPPrivacyManagerRequestResponse.swift
#	ConsentViewController/Classes/Views/tvOS/NativePrivacyManager/Common/SPNativeScreenViewController.swift
@andresilveirah andresilveirah deleted the SP-7877_ott_ui_testing branch April 7, 2022 11:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants