Skip to content

Commit 5eed9d1

Browse files
committed
Release 3.3.0
1 parent 39e78b2 commit 5eed9d1

File tree

129 files changed

+3921
-1598
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

129 files changed

+3921
-1598
lines changed

.gitignore

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ Carthage/Build
6666
# https://github.com/fastlane/fastlane/blob/master/docs/Gitignore.md
6767

6868
fastlane/report.xml
69+
fastlane/test_output
6970
fastlane/screenshots
7071
compile_commands.json
7172

@@ -76,9 +77,6 @@ UnityAds.framework
7677

7778
.DS_Store
7879

79-
# Bundler for Ruby gems
80-
Gemfile.lock
81-
8280
# intellij products
8381
.idea/
8482

.gitlab-ci.yml

Lines changed: 95 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,95 @@
1+
2+
stages:
3+
- sanity
4+
- test
5+
- build
6+
- release
7+
8+
sanity-check:
9+
stage: sanity
10+
script:
11+
- echo "hello gitlab runner"
12+
tags:
13+
- ads_sdk_osx_worker
14+
15+
unit-test:
16+
stage: test
17+
script:
18+
- ./scripts/gitlab/setup.sh
19+
- ./generate-project.rb
20+
- bundle exec fastlane unit_test
21+
tags:
22+
- ads_sdk_osx_worker
23+
24+
# unit-test-on-device:
25+
# stage: test
26+
# script:
27+
# - ./scripts/gitlab/setup.sh
28+
# - ./generate-project.rb
29+
# - bundle exec fastlane unit_test_on_device
30+
# tags:
31+
# - ads_sdk_osx_worker
32+
# - iphone
33+
34+
integration-test:
35+
stage: test
36+
script:
37+
- ./scripts/gitlab/setup.sh
38+
- ./generate-project.rb
39+
- bundle exec fastlane integration_test
40+
tags:
41+
- ads_sdk_osx_worker
42+
43+
banner-integration-test:
44+
stage: test
45+
script:
46+
- ./scripts/gitlab/setup.sh
47+
- ./generate-project.rb
48+
- bundle exec fastlane banner_integration_test
49+
tags:
50+
- ads_sdk_osx_worker
51+
52+
# integration-test-on-device:
53+
# stage: test
54+
# script:
55+
# - ./scripts/gitlab/setup.sh
56+
# - ./generate-project.rb
57+
# - bundle exec fastlane integration_test_on_device
58+
# tags:
59+
# - ads_sdk_osx_worker
60+
# - iphone
61+
62+
static-analysis:
63+
stage: test
64+
script:
65+
- ./scripts/gitlab/setup.sh
66+
- ./generate-project.rb
67+
- ./scripts/gitlab/analyze.sh
68+
tags:
69+
- ads_sdk_osx_worker
70+
71+
build-release:
72+
stage: build
73+
script:
74+
- xcodebuild -version
75+
- make zip
76+
tags:
77+
- ads_sdk_osx_worker
78+
artifacts:
79+
when: on_success
80+
paths:
81+
- UnityAds.framework.zip
82+
83+
release:
84+
only:
85+
- /^feature/gitlab-release-stage/
86+
- /^release\/[0-9\.]*/
87+
stage: release
88+
script:
89+
- echo "Running a release"
90+
- ./scripts/gitlab/post-internal-github-release.sh
91+
tags:
92+
- ads_sdk_osx_worker
93+
dependencies:
94+
- build-release
95+
when: manual

.ruby-version

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
2.3.1

Gemfile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
source 'https://rubygems.org'
22
# xcodeproj has an issue with newest Xcode, fix is not a release gem at this moment
33
# Use github master until fix is released in gem.
4-
gem 'xcodeproj', '~> 1.6.0'
4+
gem 'xcodeproj'
55
gem 'optimist'
66
gem 'plist', '~> 3.2'
7-
gem 'fastlane', '~> 2.113.0'
8-
gem 'slather', '~> 2.4.6'
7+
gem 'xcode-install'
8+
gem 'fastlane'
9+
gem 'slather', '~> 2.4.6'

Gemfile.lock

Lines changed: 190 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,190 @@
1+
GEM
2+
remote: https://rubygems.org/
3+
specs:
4+
CFPropertyList (2.3.6)
5+
activesupport (5.2.3)
6+
concurrent-ruby (~> 1.0, >= 1.0.2)
7+
i18n (>= 0.7, < 2)
8+
minitest (~> 5.1)
9+
tzinfo (~> 1.1)
10+
addressable (2.7.0)
11+
public_suffix (>= 2.0.2, < 5.0)
12+
atomos (0.1.3)
13+
babosa (1.0.3)
14+
claide (1.0.3)
15+
clamp (0.6.5)
16+
colored (1.2)
17+
colored2 (3.1.2)
18+
commander-fastlane (4.4.6)
19+
highline (~> 1.7.2)
20+
concurrent-ruby (1.1.5)
21+
declarative (0.0.10)
22+
declarative-option (0.1.0)
23+
digest-crc (0.4.1)
24+
domain_name (0.5.20190701)
25+
unf (>= 0.0.5, < 1.0.0)
26+
dotenv (2.7.5)
27+
emoji_regex (1.0.1)
28+
excon (0.66.0)
29+
faraday (0.15.4)
30+
multipart-post (>= 1.2, < 3)
31+
faraday-cookie_jar (0.0.6)
32+
faraday (>= 0.7.4)
33+
http-cookie (~> 1.0.0)
34+
faraday_middleware (0.13.1)
35+
faraday (>= 0.7.4, < 1.0)
36+
fastimage (2.1.7)
37+
fastlane (2.131.0)
38+
CFPropertyList (>= 2.3, < 4.0.0)
39+
addressable (>= 2.3, < 3.0.0)
40+
babosa (>= 1.0.2, < 2.0.0)
41+
bundler (>= 1.12.0, < 3.0.0)
42+
colored
43+
commander-fastlane (>= 4.4.6, < 5.0.0)
44+
dotenv (>= 2.1.1, < 3.0.0)
45+
emoji_regex (>= 0.1, < 2.0)
46+
excon (>= 0.45.0, < 1.0.0)
47+
faraday (~> 0.9)
48+
faraday-cookie_jar (~> 0.0.6)
49+
faraday_middleware (~> 0.9)
50+
fastimage (>= 2.1.0, < 3.0.0)
51+
gh_inspector (>= 1.1.2, < 2.0.0)
52+
google-api-client (>= 0.21.2, < 0.24.0)
53+
google-cloud-storage (>= 1.15.0, < 2.0.0)
54+
highline (>= 1.7.2, < 2.0.0)
55+
json (< 3.0.0)
56+
jwt (~> 2.1.0)
57+
mini_magick (>= 4.9.4, < 5.0.0)
58+
multi_xml (~> 0.5)
59+
multipart-post (~> 2.0.0)
60+
plist (>= 3.1.0, < 4.0.0)
61+
public_suffix (~> 2.0.0)
62+
rubyzip (>= 1.2.2, < 2.0.0)
63+
security (= 0.1.3)
64+
simctl (~> 1.6.3)
65+
slack-notifier (>= 2.0.0, < 3.0.0)
66+
terminal-notifier (>= 2.0.0, < 3.0.0)
67+
terminal-table (>= 1.4.5, < 2.0.0)
68+
tty-screen (>= 0.6.3, < 1.0.0)
69+
tty-spinner (>= 0.8.0, < 1.0.0)
70+
word_wrap (~> 1.0.0)
71+
xcodeproj (>= 1.8.1, < 2.0.0)
72+
xcpretty (~> 0.3.0)
73+
xcpretty-travis-formatter (>= 0.0.3)
74+
gh_inspector (1.1.3)
75+
google-api-client (0.23.9)
76+
addressable (~> 2.5, >= 2.5.1)
77+
googleauth (>= 0.5, < 0.7.0)
78+
httpclient (>= 2.8.1, < 3.0)
79+
mime-types (~> 3.0)
80+
representable (~> 3.0)
81+
retriable (>= 2.0, < 4.0)
82+
signet (~> 0.9)
83+
google-cloud-core (1.3.1)
84+
google-cloud-env (~> 1.0)
85+
google-cloud-env (1.2.1)
86+
faraday (~> 0.11)
87+
google-cloud-storage (1.16.0)
88+
digest-crc (~> 0.4)
89+
google-api-client (~> 0.23)
90+
google-cloud-core (~> 1.2)
91+
googleauth (>= 0.6.2, < 0.10.0)
92+
googleauth (0.6.7)
93+
faraday (~> 0.12)
94+
jwt (>= 1.4, < 3.0)
95+
memoist (~> 0.16)
96+
multi_json (~> 1.11)
97+
os (>= 0.9, < 2.0)
98+
signet (~> 0.7)
99+
highline (1.7.10)
100+
http-cookie (1.0.3)
101+
domain_name (~> 0.5)
102+
httpclient (2.8.3)
103+
i18n (1.6.0)
104+
concurrent-ruby (~> 1.0)
105+
json (2.2.0)
106+
jwt (2.1.0)
107+
memoist (0.16.0)
108+
mime-types (3.3)
109+
mime-types-data (~> 3.2015)
110+
mime-types-data (3.2019.0904)
111+
mini_magick (4.9.5)
112+
mini_portile2 (2.3.0)
113+
minitest (5.11.3)
114+
multi_json (1.13.1)
115+
multi_xml (0.6.0)
116+
multipart-post (2.0.0)
117+
nanaimo (0.2.6)
118+
naturally (2.2.0)
119+
nokogiri (1.8.5)
120+
mini_portile2 (~> 2.3.0)
121+
optimist (3.0.0)
122+
os (1.0.1)
123+
plist (3.5.0)
124+
public_suffix (2.0.5)
125+
representable (3.0.4)
126+
declarative (< 0.1.0)
127+
declarative-option (< 0.2.0)
128+
uber (< 0.2.0)
129+
retriable (3.1.2)
130+
rouge (2.0.7)
131+
rubyzip (1.2.4)
132+
security (0.1.3)
133+
signet (0.11.0)
134+
addressable (~> 2.3)
135+
faraday (~> 0.9)
136+
jwt (>= 1.5, < 3.0)
137+
multi_json (~> 1.10)
138+
simctl (1.6.6)
139+
CFPropertyList
140+
naturally
141+
slack-notifier (2.3.2)
142+
slather (2.4.6)
143+
CFPropertyList (~> 2.2)
144+
activesupport (>= 4.0.2)
145+
clamp (~> 0.6)
146+
nokogiri (~> 1.8.2)
147+
xcodeproj (~> 1.4)
148+
terminal-notifier (2.0.0)
149+
terminal-table (1.8.0)
150+
unicode-display_width (~> 1.1, >= 1.1.1)
151+
thread_safe (0.3.6)
152+
tty-cursor (0.7.0)
153+
tty-screen (0.7.0)
154+
tty-spinner (0.9.1)
155+
tty-cursor (~> 0.7)
156+
tzinfo (1.2.5)
157+
thread_safe (~> 0.1)
158+
uber (0.1.0)
159+
unf (0.1.4)
160+
unf_ext
161+
unf_ext (0.0.7.6)
162+
unicode-display_width (1.6.0)
163+
word_wrap (1.0.0)
164+
xcode-install (2.6.0)
165+
claide (>= 0.9.1, < 1.1.0)
166+
fastlane (>= 2.1.0, < 3.0.0)
167+
xcodeproj (1.12.0)
168+
CFPropertyList (>= 2.3.3, < 4.0)
169+
atomos (~> 0.1.3)
170+
claide (>= 1.0.2, < 2.0)
171+
colored2 (~> 3.1)
172+
nanaimo (~> 0.2.6)
173+
xcpretty (0.3.0)
174+
rouge (~> 2.0.7)
175+
xcpretty-travis-formatter (1.0.0)
176+
xcpretty (~> 0.2, >= 0.0.7)
177+
178+
PLATFORMS
179+
ruby
180+
181+
DEPENDENCIES
182+
fastlane
183+
optimist
184+
plist (~> 3.2)
185+
slather (~> 2.4.6)
186+
xcode-install
187+
xcodeproj
188+
189+
BUNDLED WITH
190+
2.0.2

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
# Unity Ads 3 iOS Release Repository
1+
# Unity Ads iOS Release Repository
22

3-
Welcome to the Unity Ads 3 iOS release repository.
3+
Welcome to the Unity Ads iOS release repository.
44

55
## Supported Integration Configurations
66

UnityAds.podspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
Pod::Spec.new do |s|
22
s.name = 'UnityAds'
3-
s.version = '3.1.0'
3+
s.version = '3.3.0'
44
s.license = { :type => 'Apache License, Version 2.0', :file => 'LICENSE' }
55
s.author = { 'UnityAds' => '[email protected]' }
66
s.homepage = 'https://unity3d.com/services/ads'
77
s.summary = 'Monetize your entire player base and reach new audiences with video ads.'
88
s.platform = :ios
9-
s.source = { :http => 'https://github.com/Unity-Technologies/unity-ads-ios/releases/download/3.1.0/UnityAds.framework.zip' }
9+
s.source = { :http => 'https://github.com/Unity-Technologies/unity-ads-ios/releases/download/3.3.0/UnityAds.framework.zip' }
1010
s.ios.deployment_target = '7.0'
1111
s.ios.vendored_frameworks = 'UnityAds.framework'
1212
s.ios.xcconfig = { 'OTHER_LDFLAGS' => '-framework UnityAds' }
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
#import <Foundation/Foundation.h>
2+
#import "UADSBannerViewDelegate.h"
3+
4+
@interface BannerTestDelegate : NSObject <UADSBannerViewDelegate>
5+
6+
@property(nonatomic, copy) void (^didLoadBlock)(UADSBannerView *);
7+
@property(nonatomic, copy) void (^didClickBlock)(UADSBannerView *);
8+
@property(nonatomic, copy) void (^didLeaveApplicationBlock)(UADSBannerView *);
9+
@property(nonatomic, copy) void (^didErrorBlock)(UADSBannerView *, UADSBannerError *error);
10+
11+
@end
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
#import "BannerTestDelegate.h"
2+
3+
@implementation BannerTestDelegate
4+
5+
// MARK UnityAdsBannerDelegate
6+
7+
- (void)bannerViewDidLoad:(UADSBannerView *)bannerView {
8+
if (_didLoadBlock) {
9+
_didLoadBlock(bannerView);
10+
}
11+
}
12+
13+
- (void)bannerViewDidClick:(UADSBannerView *)bannerView {
14+
if (_didClickBlock) {
15+
_didClickBlock(bannerView);
16+
}
17+
}
18+
19+
- (void)bannerViewDidLeaveApplication:(UADSBannerView *)bannerView {
20+
if (_didLeaveApplicationBlock) {
21+
_didLeaveApplicationBlock(bannerView);
22+
}
23+
}
24+
25+
- (void)bannerViewDidError:(UADSBannerView *)bannerView error:(UADSBannerError *)error {
26+
if (_didErrorBlock) {
27+
_didErrorBlock(bannerView, error);
28+
}
29+
}
30+
31+
@end

0 commit comments

Comments
 (0)