Release 3.3.0

Unity-Technologies · Oct 7, 2019 · 5eed9d1 · 5eed9d1
1 parent 39e78b2
commit 5eed9d1
Show file tree

Hide file tree

Showing 129 changed files with 3,921 additions and 1,598 deletions.
diff --git a/.gitignore b/.gitignore
@@ -66,6 +66,7 @@ Carthage/Build
 # https://github.com/fastlane/fastlane/blob/master/docs/Gitignore.md
 
 fastlane/report.xml
+fastlane/test_output
 fastlane/screenshots
 compile_commands.json
 
@@ -76,9 +77,6 @@ UnityAds.framework
 
 .DS_Store
 
-# Bundler for Ruby gems
-Gemfile.lock
-
 # intellij products
 .idea/
 

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -0,0 +1,95 @@
+
+stages:
+  - sanity
+  - test
+  - build
+  - release
+
+sanity-check:
+  stage: sanity
+  script:
+    - echo "hello gitlab runner"
+  tags:
+    - ads_sdk_osx_worker
+
+unit-test:
+  stage: test
+  script:
+    - ./scripts/gitlab/setup.sh
+    - ./generate-project.rb
+    - bundle exec fastlane unit_test
+  tags:
+    - ads_sdk_osx_worker
+
+# unit-test-on-device:
+#   stage: test
+#   script: 
+#     - ./scripts/gitlab/setup.sh
+#     - ./generate-project.rb
+#     - bundle exec fastlane unit_test_on_device
+#   tags:
+#     - ads_sdk_osx_worker
+#     - iphone
+
+integration-test:
+  stage: test
+  script:
+    - ./scripts/gitlab/setup.sh
+    - ./generate-project.rb
+    - bundle exec fastlane integration_test
+  tags:
+    - ads_sdk_osx_worker
+
+banner-integration-test:
+  stage: test
+  script:
+    - ./scripts/gitlab/setup.sh
+    - ./generate-project.rb
+    - bundle exec fastlane banner_integration_test
+  tags:
+    - ads_sdk_osx_worker
+
+# integration-test-on-device:
+#   stage: test
+#   script:
+#     - ./scripts/gitlab/setup.sh
+#     - ./generate-project.rb
+#     - bundle exec fastlane integration_test_on_device
+#   tags:
+#     - ads_sdk_osx_worker
+#     - iphone
+
+static-analysis:
+  stage: test
+  script:
+    - ./scripts/gitlab/setup.sh
+    - ./generate-project.rb
+    - ./scripts/gitlab/analyze.sh
+  tags:
+    - ads_sdk_osx_worker
+
+build-release:
+  stage: build
+  script:
+    - xcodebuild -version
+    - make zip
+  tags:
+    - ads_sdk_osx_worker
+  artifacts:
+    when: on_success
+    paths:
+      - UnityAds.framework.zip
+
+release:
+  only: 
+    - /^feature/gitlab-release-stage/
+    - /^release\/[0-9\.]*/
+  stage: release
+  script:
+    - echo "Running a release"
+    - ./scripts/gitlab/post-internal-github-release.sh
+  tags:
+    - ads_sdk_osx_worker
+  dependencies:
+    - build-release
+  when: manual
diff --git a/.ruby-version b/.ruby-version
@@ -0,0 +1 @@
+2.3.1
diff --git a/Gemfile b/Gemfile
@@ -1,8 +1,9 @@
 source 'https://rubygems.org'
 # xcodeproj has an issue with newest Xcode, fix is not a release gem at this moment
 # Use github master until fix is released in gem.
-gem 'xcodeproj', '~> 1.6.0'
+gem 'xcodeproj'
 gem 'optimist'
 gem 'plist', '~> 3.2'
-gem 'fastlane', '~> 2.113.0'
-gem 'slather', '~> 2.4.6'
+gem 'xcode-install'
+gem 'fastlane'
+gem 'slather', '~> 2.4.6'
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -0,0 +1,190 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    CFPropertyList (2.3.6)
+    activesupport (5.2.3)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
+    atomos (0.1.3)
+    babosa (1.0.3)
+    claide (1.0.3)
+    clamp (0.6.5)
+    colored (1.2)
+    colored2 (3.1.2)
+    commander-fastlane (4.4.6)
+      highline (~> 1.7.2)
+    concurrent-ruby (1.1.5)
+    declarative (0.0.10)
+    declarative-option (0.1.0)
+    digest-crc (0.4.1)
+    domain_name (0.5.20190701)
+      unf (>= 0.0.5, < 1.0.0)
+    dotenv (2.7.5)
+    emoji_regex (1.0.1)
+    excon (0.66.0)
+    faraday (0.15.4)
+      multipart-post (>= 1.2, < 3)
+    faraday-cookie_jar (0.0.6)
+      faraday (>= 0.7.4)
+      http-cookie (~> 1.0.0)
+    faraday_middleware (0.13.1)
+      faraday (>= 0.7.4, < 1.0)
+    fastimage (2.1.7)
+    fastlane (2.131.0)
+      CFPropertyList (>= 2.3, < 4.0.0)
+      addressable (>= 2.3, < 3.0.0)
+      babosa (>= 1.0.2, < 2.0.0)
+      bundler (>= 1.12.0, < 3.0.0)
+      colored
+      commander-fastlane (>= 4.4.6, < 5.0.0)
+      dotenv (>= 2.1.1, < 3.0.0)
+      emoji_regex (>= 0.1, < 2.0)
+      excon (>= 0.45.0, < 1.0.0)
+      faraday (~> 0.9)
+      faraday-cookie_jar (~> 0.0.6)
+      faraday_middleware (~> 0.9)
+      fastimage (>= 2.1.0, < 3.0.0)
+      gh_inspector (>= 1.1.2, < 2.0.0)
+      google-api-client (>= 0.21.2, < 0.24.0)
+      google-cloud-storage (>= 1.15.0, < 2.0.0)
+      highline (>= 1.7.2, < 2.0.0)
+      json (< 3.0.0)
+      jwt (~> 2.1.0)
+      mini_magick (>= 4.9.4, < 5.0.0)
+      multi_xml (~> 0.5)
+      multipart-post (~> 2.0.0)
+      plist (>= 3.1.0, < 4.0.0)
+      public_suffix (~> 2.0.0)
+      rubyzip (>= 1.2.2, < 2.0.0)
+      security (= 0.1.3)
+      simctl (~> 1.6.3)
+      slack-notifier (>= 2.0.0, < 3.0.0)
+      terminal-notifier (>= 2.0.0, < 3.0.0)
+      terminal-table (>= 1.4.5, < 2.0.0)
+      tty-screen (>= 0.6.3, < 1.0.0)
+      tty-spinner (>= 0.8.0, < 1.0.0)
+      word_wrap (~> 1.0.0)
+      xcodeproj (>= 1.8.1, < 2.0.0)
+      xcpretty (~> 0.3.0)
+      xcpretty-travis-formatter (>= 0.0.3)
+    gh_inspector (1.1.3)
+    google-api-client (0.23.9)
+      addressable (~> 2.5, >= 2.5.1)
+      googleauth (>= 0.5, < 0.7.0)
+      httpclient (>= 2.8.1, < 3.0)
+      mime-types (~> 3.0)
+      representable (~> 3.0)
+      retriable (>= 2.0, < 4.0)
+      signet (~> 0.9)
+    google-cloud-core (1.3.1)
+      google-cloud-env (~> 1.0)
+    google-cloud-env (1.2.1)
+      faraday (~> 0.11)
+    google-cloud-storage (1.16.0)
+      digest-crc (~> 0.4)
+      google-api-client (~> 0.23)
+      google-cloud-core (~> 1.2)
+      googleauth (>= 0.6.2, < 0.10.0)
+    googleauth (0.6.7)
+      faraday (~> 0.12)
+      jwt (>= 1.4, < 3.0)
+      memoist (~> 0.16)
+      multi_json (~> 1.11)
+      os (>= 0.9, < 2.0)
+      signet (~> 0.7)
+    highline (1.7.10)
+    http-cookie (1.0.3)
+      domain_name (~> 0.5)
+    httpclient (2.8.3)
+    i18n (1.6.0)
+      concurrent-ruby (~> 1.0)
+    json (2.2.0)
+    jwt (2.1.0)
+    memoist (0.16.0)
+    mime-types (3.3)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2019.0904)
+    mini_magick (4.9.5)
+    mini_portile2 (2.3.0)
+    minitest (5.11.3)
+    multi_json (1.13.1)
+    multi_xml (0.6.0)
+    multipart-post (2.0.0)
+    nanaimo (0.2.6)
+    naturally (2.2.0)
+    nokogiri (1.8.5)
+      mini_portile2 (~> 2.3.0)
+    optimist (3.0.0)
+    os (1.0.1)
+    plist (3.5.0)
+    public_suffix (2.0.5)
+    representable (3.0.4)
+      declarative (< 0.1.0)
+      declarative-option (< 0.2.0)
+      uber (< 0.2.0)
+    retriable (3.1.2)
+    rouge (2.0.7)
+    rubyzip (1.2.4)
+    security (0.1.3)
+    signet (0.11.0)
+      addressable (~> 2.3)
+      faraday (~> 0.9)
+      jwt (>= 1.5, < 3.0)
+      multi_json (~> 1.10)
+    simctl (1.6.6)
+      CFPropertyList
+      naturally
+    slack-notifier (2.3.2)
+    slather (2.4.6)
+      CFPropertyList (~> 2.2)
+      activesupport (>= 4.0.2)
+      clamp (~> 0.6)
+      nokogiri (~> 1.8.2)
+      xcodeproj (~> 1.4)
+    terminal-notifier (2.0.0)
+    terminal-table (1.8.0)
+      unicode-display_width (~> 1.1, >= 1.1.1)
+    thread_safe (0.3.6)
+    tty-cursor (0.7.0)
+    tty-screen (0.7.0)
+    tty-spinner (0.9.1)
+      tty-cursor (~> 0.7)
+    tzinfo (1.2.5)
+      thread_safe (~> 0.1)
+    uber (0.1.0)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.7.6)
+    unicode-display_width (1.6.0)
+    word_wrap (1.0.0)
+    xcode-install (2.6.0)
+      claide (>= 0.9.1, < 1.1.0)
+      fastlane (>= 2.1.0, < 3.0.0)
+    xcodeproj (1.12.0)
+      CFPropertyList (>= 2.3.3, < 4.0)
+      atomos (~> 0.1.3)
+      claide (>= 1.0.2, < 2.0)
+      colored2 (~> 3.1)
+      nanaimo (~> 0.2.6)
+    xcpretty (0.3.0)
+      rouge (~> 2.0.7)
+    xcpretty-travis-formatter (1.0.0)
+      xcpretty (~> 0.2, >= 0.0.7)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  fastlane
+  optimist
+  plist (~> 3.2)
+  slather (~> 2.4.6)
+  xcode-install
+  xcodeproj
+
+BUNDLED WITH
+   2.0.2
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
-# Unity Ads 3 iOS Release Repository
+# Unity Ads iOS Release Repository
 
-Welcome to the Unity Ads 3 iOS release repository.
+Welcome to the Unity Ads iOS release repository.
 
 ## Supported Integration Configurations
 

diff --git a/UnityAds.podspec b/UnityAds.podspec
@@ -1,12 +1,12 @@
 Pod::Spec.new do |s|
   s.name = 'UnityAds'
-  s.version = '3.1.0'
+  s.version = '3.3.0'
   s.license = { :type => 'Apache License, Version 2.0', :file => 'LICENSE' }
   s.author = { 'UnityAds' => '[email protected]' }
   s.homepage = 'https://unity3d.com/services/ads'
   s.summary = 'Monetize your entire player base and reach new audiences with video ads.'
   s.platform = :ios
-  s.source = { :http => 'https://github.com/Unity-Technologies/unity-ads-ios/releases/download/3.1.0/UnityAds.framework.zip' }
+  s.source = { :http => 'https://github.com/Unity-Technologies/unity-ads-ios/releases/download/3.3.0/UnityAds.framework.zip' }
   s.ios.deployment_target = '7.0'
   s.ios.vendored_frameworks = 'UnityAds.framework'  
   s.ios.xcconfig = { 'OTHER_LDFLAGS' => '-framework UnityAds' }

diff --git a/UnityAdsBannerIntegrationTests/BannerTestDelegate.h b/UnityAdsBannerIntegrationTests/BannerTestDelegate.h
@@ -0,0 +1,11 @@
+#import <Foundation/Foundation.h>
+#import "UADSBannerViewDelegate.h"
+
+@interface BannerTestDelegate : NSObject <UADSBannerViewDelegate>
+
+@property(nonatomic, copy) void (^didLoadBlock)(UADSBannerView *);
+@property(nonatomic, copy) void (^didClickBlock)(UADSBannerView *);
+@property(nonatomic, copy) void (^didLeaveApplicationBlock)(UADSBannerView *);
+@property(nonatomic, copy) void (^didErrorBlock)(UADSBannerView *, UADSBannerError *error);
+
+@end
diff --git a/UnityAdsBannerIntegrationTests/BannerTestDelegate.m b/UnityAdsBannerIntegrationTests/BannerTestDelegate.m
@@ -0,0 +1,31 @@
+#import "BannerTestDelegate.h"
+
+@implementation BannerTestDelegate
+
+// MARK UnityAdsBannerDelegate
+
+- (void)bannerViewDidLoad:(UADSBannerView *)bannerView {
+    if (_didLoadBlock) {
+        _didLoadBlock(bannerView);
+    }
+}
+
+- (void)bannerViewDidClick:(UADSBannerView *)bannerView {
+    if (_didClickBlock) {
+        _didClickBlock(bannerView);
+    }
+}
+
+- (void)bannerViewDidLeaveApplication:(UADSBannerView *)bannerView {
+    if (_didLeaveApplicationBlock) {
+        _didLeaveApplicationBlock(bannerView);
+    }
+}
+
+- (void)bannerViewDidError:(UADSBannerView *)bannerView error:(UADSBannerError *)error {
+    if (_didErrorBlock) {
+        _didErrorBlock(bannerView, error);
+    }
+}
+
+@end