Release 3.3.0

Author: UnitySteven

.editorconfig

@@ -5,10 +5,12 @@ local.properties
 build
 captures
 testServerAddress.txt
-app/app.iml
-lib/lib.iml
+app/bin
+unity-ads/bin
 javadoc
 .settings
 .project
 .vscode
-.classpath
+.classpath
+*.iml
+fastlane/report.xml

.gitignore

@@ -0,0 +1,70 @@
+variables:
+
+stages:
+  - test
+  - build
+  - release
+
+instrumentation-test:
+  stage: test
+  script:
+    - ./scripts/gitlab/setup.sh
+    - ./scripts/gitlab/instrumentation_test.sh
+  tags:
+    - ads_sdk_osx_worker
+
+integration-test:
+  stage: test
+  script:
+    - ./scripts/gitlab/setup.sh
+    - ./scripts/gitlab/integration_test.sh
+  tags:
+    - ads_sdk_osx_worker
+
+legacy-test:
+  stage: test
+  script:
+    - ./scripts/gitlab/setup.sh
+    - ./scripts/gitlab/legacy_test.sh
+  tags:
+    - ads_sdk_osx_worker
+    
+build-release:
+  stage: build
+  script:
+    - make zip
+  tags:
+    - ads_sdk_osx_worker
+  artifacts:
+    when: on_success
+    paths:
+      - unity-ads.aar.zip
+
+internal-release:
+  only: 
+    - /^feature/ci/
+    - /^release\/[0-9\.]*/
+  stage: release
+  script:
+    - echo "Running an internal release"
+    - ./scripts/gitlab/post-internal-github-release.sh
+  tags:
+    - ads_sdk_osx_worker
+  dependencies:
+    - build-release
+  when: manual
+
+# # TODO
+# public-release:
+#   only: 
+#     - /^feature/ci/
+#     - /^release\/[0-9\.]*/
+#   stage: release
+#   script:
+#     - echo "Running a public release"
+#     - ./scripts/gitlab/post-public-github-release.sh
+#   tags:
+#     - ads_sdk_osx_worker
+#   dependencies:
+#     - build-release
+#   when: manual

.gitlab-ci.yml

@@ -0,0 +1 @@
+2.3.1

.ruby-version

@@ -0,0 +1,3 @@
+source "https://rubygems.org"
+
+gem "fastlane"

Gemfile

@@ -0,0 +1,159 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    CFPropertyList (3.0.1)
+    addressable (2.6.0)
+      public_suffix (>= 2.0.2, < 4.0)
+    atomos (0.1.3)
+    babosa (1.0.2)
+    claide (1.0.3)
+    colored (1.2)
+    colored2 (3.1.2)
+    commander-fastlane (4.4.6)
+      highline (~> 1.7.2)
+    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.5)
+    fastlane (2.130.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)
+    json (2.2.0)
+    jwt (2.1.0)
+    memoist (0.16.0)
+    mime-types (3.2.2)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2019.0331)
+    mini_magick (4.9.5)
+    multi_json (1.13.1)
+    multi_xml (0.6.0)
+    multipart-post (2.0.0)
+    nanaimo (0.2.6)
+    naturally (2.2.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.3)
+    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.5)
+      CFPropertyList
+      naturally
+    slack-notifier (2.3.2)
+    terminal-notifier (2.0.0)
+    terminal-table (1.8.0)
+      unicode-display_width (~> 1.1, >= 1.1.1)
+    tty-cursor (0.7.0)
+    tty-screen (0.7.0)
+    tty-spinner (0.9.1)
+      tty-cursor (~> 0.7)
+    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)
+    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
+
+BUNDLED WITH
+   2.0.2

Gemfile.lock

@@ -1,8 +1,8 @@
 release:
-	./gradlew :lib:assembleRelease
+	./gradlew :unity-ads:assembleRelease
 
 clean:
-	./gradlew :lib:clean
+	./gradlew :unity-ads:clean
 
 test: test-hosted
 
@@ -11,7 +11,7 @@ test-local: push-test-server-address exec-tests
 test-unit-tests: push-test-server-address exec-unit-tests
 
 build-test-apk: clean
-	./gradlew :lib:assembleAndroidTest --full-stacktrace
+	./gradlew :unity-ads:assembleAndroidTest --full-stacktrace
 
 test-emulator: exec-tests
 
@@ -23,11 +23,11 @@ exec-tests: exec-unit-tests exec-hybrid-tests
 
 exec-unit-tests: clean
 	adb shell input keyevent 82
-	./gradlew :lib:connectedCheck --full-stacktrace -Pandroid.testInstrumentationRunnerArguments.class=com.unity3d.ads.test.UnitTestSuite
+	./gradlew :unity-ads:connectedCheck --full-stacktrace -Pandroid.testInstrumentationRunnerArguments.class=com.unity3d.ads.test.LegacyTestSuite
 
 exec-hybrid-tests: clean
 	adb shell input keyevent 82
-	./gradlew :lib:connectedCheck --full-stacktrace -Pandroid.testInstrumentationRunnerArguments.class=com.unity3d.ads.test.HybridTestSuite
+	./gradlew :unity-ads:connectedCheck --full-stacktrace -Pandroid.testInstrumentationRunnerArguments.class=com.unity3d.ads.test.HybridTestSuite
 
 push-test-server-address:
 	echo http://$(shell ifconfig |grep "inet" |grep -E -o "([0-9]{1,3}[\.]){3}[0-9]{1,3}" |grep -v -E "^0|^127" -m 1):8080 > testServerAddress.txt
@@ -48,16 +48,30 @@ dismantle-adb-reverse:
 	adb reverse --remove-all
 
 javadoc:
-	./gradlew :lib:javadoc
+	./gradlew :unity-ads:javadoc
 
 zip: release
-	cp lib/build/outputs/aar/unity-ads-release.aar unity-ads.aar
-	zip -9r builds.zip unity-ads.aar
+	cp unity-ads/build/outputs/aar/unity-ads-release.aar unity-ads.aar
+	zip -9r unity-ads.aar.zip unity-ads.aar
 	rm unity-ads.aar
 
+verify-release-build:
+	if [[ -f "unity-ads.aar.zip" ]]; then \
+		echo 'unity-ads.aar.zip exists'; \
+	else \
+		echo 'unity-ads.aar.zip does not exist'; \
+		exit 1; \
+	fi;
+
 use-local-webview:
-	sed -i '' 's/return "https:\/\/config.unityads.unity3d.com\/webview\/" + getWebViewBranch() + "\/" + flavor + "\/config.json";/return "new-ip";/' "lib/src/main/java/com/unity3d/services/core/properties/SdkProperties.java"
-	sed -i '' 's/return ".*";/return "http:\/\/$(shell ifconfig |grep "inet" |grep -E -o "([0-9]{1,3}[\.]){3}[0-9]{1,3}" |grep -v -E "^0|^127" -m 1):8000\/build\/" + flavor + "\/config.json";/' "lib/src/main/java/com/unity3d/services/core/properties/SdkProperties.java"
+	sed -i '' 's/return "https:\/\/config.unityads.unity3d.com\/webview\/" + getWebViewBranch() + "\/" + flavor + "\/config.json";/return "new-ip";/' "unity-ads/src/main/java/com/unity3d/services/core/properties/SdkProperties.java"
+	sed -i '' 's/return ".*";/return "http:\/\/$(shell ifconfig |grep "inet" |grep -E -o "([0-9]{1,3}[\.]){3}[0-9]{1,3}" |grep -v -E "^0|^127" -m 1):8000\/build\/" + flavor + "\/config.json";/' "unity-ads/src/main/java/com/unity3d/services/core/properties/SdkProperties.java"
 
 use-public-webview:
-	sed -i '' 's/return ".*";/return "https:\/\/config.unityads.unity3d.com\/webview\/" + getWebViewBranch() + "\/" + flavor + "\/config.json";/' "lib/src/main/java/com/unity3d/services/core/properties/SdkProperties.java"
+	sed -i '' 's/return ".*";/return "https:\/\/config.unityads.unity3d.com\/webview\/" + getWebViewBranch() + "\/" + flavor + "\/config.json";/' "unity-ads/src/main/java/com/unity3d/services/core/properties/SdkProperties.java"
+
+create-android-26-emulator:
+	echo "no" | ${ANDROID_HOME}/tools/bin/avdmanager create avd --name "android-26-test" --package "system-images;android-26;google_apis;x86" --device "Nexus 6P" --tag google_apis --abi google_apis/x86 --force
+
+start-android-26-emulator:
+	${ANDROID_HOME}/emulator/emulator -port 5556 -avd android-26-test -no-window -noaudio -no-boot-anim -memory 2048 -partition-size 1024 &

Jenkinsfile

@@ -1,6 +1,6 @@
-# Unity Ads Android Release Repository
+# Unity Ads 3 Android Release Repository
 
-Welcome to the Unity Ads Android release repository.
+Welcome to the Unity Ads 3 Android release repository.
 
 ## Binaries