Skip to content

Commit 2606de4

Browse files
UnityStevenUnitySteven
committed
Release 3.7.0
1 parent 2417560 commit 2606de4

File tree

107 files changed

+2679
-1049
lines changed

Some content is hidden

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

107 files changed

+2679
-1049
lines changed

‎app/build.gradle

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ android {
88
applicationId "com.unity3d.ads.example"
99
minSdkVersion 19
1010
targetSdkVersion 30
11-
versionCode = 3620
12-
versionName = "3.6.2"
11+
versionCode = 3700
12+
versionName = "3.7.0"
1313
}
1414

1515
flavorDimensions "arEnabled"
@@ -36,10 +36,10 @@ android {
3636

3737
dependencies {
3838
implementation fileTree(include: ['*.jar'], dir: 'libs')
39-
implementation 'com.android.support:appcompat-v7:26.1.0'
40-
implementation 'com.android.support:design:26.1.0'
41-
implementation 'com.android.support.constraint:constraint-layout:1.1.3'
42-
implementation 'android.arch.lifecycle:extensions:1.1.1'
39+
implementation 'androidx.appcompat:appcompat:1.0.0'
40+
implementation 'com.google.android.material:material:1.0.0'
41+
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
42+
implementation 'androidx.lifecycle:lifecycle-extensions:2.0.0'
4343
arImplementation 'com.google.ar:core:1.4.0'
4444
implementation project(':unity-ads')
4545
}

‎app/src/main/java/com/unity3d/ads/example/UnityAdsTestApp.java

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,9 @@
11
package com.unity3d.ads.example;
22

33
import android.os.Bundle;
4-
import android.support.design.widget.FloatingActionButton;
5-
import android.support.design.widget.Snackbar;
6-
import android.support.design.widget.TabLayout;
7-
import android.support.v4.view.ViewPager;
8-
import android.support.v7.app.AppCompatActivity;
9-
import android.view.Menu;
10-
import android.view.MenuItem;
11-
import android.view.View;
12-
4+
import androidx.viewpager.widget.ViewPager;
5+
import androidx.appcompat.app.AppCompatActivity;
6+
import com.google.android.material.tabs.TabLayout;
137
import com.unity3d.ads.example.ui.main.SectionsPagerAdapter;
148

159
public class UnityAdsTestApp extends AppCompatActivity {

‎app/src/main/java/com/unity3d/ads/example/ui/main/SectionsPagerAdapter.java

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
11
package com.unity3d.ads.example.ui.main;
22

33
import android.content.Context;
4-
import android.support.annotation.Nullable;
5-
import android.support.annotation.StringRes;
6-
import android.support.v4.app.Fragment;
7-
import android.support.v4.app.FragmentManager;
8-
import android.support.v4.app.FragmentPagerAdapter;
9-
10-
import com.unity3d.ads.example.R;
4+
import androidx.annotation.Nullable;
5+
import androidx.fragment.app.Fragment;
6+
import androidx.fragment.app.FragmentManager;
7+
import androidx.fragment.app.FragmentPagerAdapter;
118

129
/**
1310
* A [FragmentPagerAdapter] that returns a fragment corresponding to

‎app/src/main/java/com/unity3d/ads/example/ui/main/UnityAdsFragment.java

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
import android.view.LayoutInflater;
99
import android.view.View;
1010
import android.view.ViewGroup;
11-
import android.support.annotation.NonNull;
12-
import android.support.v4.app.Fragment;
11+
import androidx.annotation.NonNull;
12+
import androidx.fragment.app.Fragment;
1313
import android.view.animation.AlphaAnimation;
1414
import android.widget.Button;
1515
import android.widget.CheckBox;
@@ -29,12 +29,8 @@
2929
import com.unity3d.services.banners.view.BannerPosition;
3030
import com.unity3d.services.core.log.DeviceLog;
3131
import com.unity3d.services.core.misc.Utilities;
32-
import com.unity3d.services.core.properties.SdkProperties;
3332
import com.unity3d.services.core.webview.WebView;
3433

35-
import java.net.MalformedURLException;
36-
import java.net.URISyntaxException;
37-
3834
/**
3935
* A placeholder fragment containing a simple view.
4036
*/

‎app/src/main/res/layout/activity_unity_ads_test_app.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
2+
<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
33
xmlns:app="http://schemas.android.com/apk/res-auto"
44
xmlns:tools="http://schemas.android.com/tools"
55
android:layout_width="match_parent"
66
android:layout_height="match_parent"
77
tools:context=".UnityAdsTestApp">
88

9-
<android.support.design.widget.AppBarLayout
9+
<com.google.android.material.appbar.AppBarLayout
1010
android:layout_width="match_parent"
1111
android:layout_height="wrap_content"
1212
android:theme="@style/AppTheme.AppBarOverlay">
@@ -21,17 +21,17 @@
2121
android:text="@string/app_name"
2222
android:textAppearance="@style/TextAppearance.Widget.AppCompat.Toolbar.Title" />
2323

24-
<android.support.design.widget.TabLayout
24+
<com.google.android.material.tabs.TabLayout
2525
android:id="@+id/tabs"
2626
android:layout_width="match_parent"
2727
android:layout_height="wrap_content"
2828
android:background="?attr/colorPrimary" />
29-
</android.support.design.widget.AppBarLayout>
29+
</com.google.android.material.appbar.AppBarLayout>
3030

31-
<android.support.v4.view.ViewPager
31+
<androidx.viewpager.widget.ViewPager
3232
android:id="@+id/view_pager"
3333
android:layout_width="match_parent"
3434
android:layout_height="match_parent"
3535
app:layout_behavior="@string/appbar_scrolling_view_behavior" />
3636

37-
</android.support.design.widget.CoordinatorLayout>
37+
</androidx.coordinatorlayout.widget.CoordinatorLayout>

‎build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ buildscript {
44
jcenter()
55
google()
66
}
7-
dependencies {
8-
classpath 'com.android.tools.build:gradle:3.1.4'
97

8+
dependencies {
9+
classpath 'com.android.tools.build:gradle:3.2.0'
1010
// NOTE: Do not place your application dependencies here; they belong
1111
// in the individual module build.gradle files
1212
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.4'

‎gradle.properties

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,5 @@
1515
# When configured, Gradle will run in incubating parallel mode.
1616
# This option should only be used with decoupled projects. More details, visit
1717
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
18-
# org.gradle.parallel=true
18+
# org.gradle.parallel=true
19+
android.useAndroidX=true

‎unity-ads/build.gradle

Lines changed: 24 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ ext {
1717
siteUrl = 'https://github.com/Unity-Technologies/unity-ads-android'
1818
gitUrl = 'https://github.com/Unity-Technologies/unity-ads-android.git'
1919

20-
libraryVersion = '3.6.2'
20+
libraryVersion = '3.7.0'
2121

2222
developerId = 'sbankhead'
2323
developerName = 'Steven Bankhead'
@@ -31,7 +31,7 @@ ext {
3131
version = libraryVersion
3232

3333
android {
34-
compileSdkVersion 26
34+
compileSdkVersion 30
3535
buildToolsVersion '28.0.2'
3636
com.android.ddmlib.DdmPreferences.setLogLevel("verbose")
3737
com.android.ddmlib.DdmPreferences.setTimeOut(10 * 60000)
@@ -40,7 +40,7 @@ android {
4040

4141
defaultConfig {
4242
minSdkVersion 19
43-
targetSdkVersion 29
43+
targetSdkVersion 30
4444
/*
4545
Please ensure that the last two digits of version number does not exceed 50 unless
4646
it is a China SDK. This is because adding 50 to the version number is a one-to-one
@@ -51,16 +51,15 @@ android {
5151
All SDK with version numbers with last two digits >= 50 will be treated
5252
as China SDK for filtering in the backend.
5353
*/
54-
versionCode = 3620
55-
versionName = "3.6.2"
54+
versionCode = 3700
55+
versionName = "3.7.0"
5656

5757
setProperty("archivesBaseName", "unity-ads")
5858

59-
buildConfigField 'String', 'WEBVIEW_BRANCH', getPropertyStringWithDefaultValue('WEBVIEW_BRANCH', '"' + versionName + '"')
60-
59+
buildConfigField('String', 'WEBVIEW_BRANCH', getPropertyStringWithDefaultValue('WEBVIEW_BRANCH', '"' + versionName + '"'))
6160
testBuildType "debug"
6261

63-
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
62+
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
6463
testInstrumentationRunnerArguments disableAnalytics: 'true' // Won't work yet, see: https://code.google.com/p/android/issues/detail?id=188241
6564
}
6665

@@ -99,31 +98,31 @@ android {
9998

10099
dependencies {
101100
testImplementation 'junit:junit:4.12'
102-
androidTestImplementation 'org.mockito:mockito-core:2.19.1'
103-
androidTestImplementation 'org.mockito:mockito-android:2.19.1'
104-
androidTestImplementation 'com.android.support.test:runner:1.0.2'
105-
androidTestImplementation 'com.android.support.test:rules:1.0.2'
101+
androidTestImplementation 'org.mockito:mockito-core:2.25.0'
102+
androidTestImplementation 'org.mockito:mockito-android:2.25.0'
103+
androidTestImplementation 'androidx.test.ext:junit:1.1.1'
104+
androidTestImplementation 'androidx.test:rules:1.1.1'
106105
compileOnly 'com.google.ar:core:1.0.0'
107106
}
108107

109108
task javadoc(type: Javadoc, overwrite: true) {
110-
description "Generates Javadoc for Release"
111-
source = android.sourceSets.main.java.srcDirs
112-
ext.androidJar = "${android.sdkDirectory}/platforms/${android.compileSdkVersion}/android.jar"
113-
doFirst {
114-
classpath = project.files(android.getBootClasspath().join(File.pathSeparator)) + files(ext.androidJar)
115-
}
109+
description "Generates Javadoc for Release"
110+
source = android.sourceSets.main.java.srcDirs
111+
ext.androidJar = "${android.sdkDirectory}/platforms/${android.compileSdkVersion}/android.jar"
112+
doFirst {
113+
classpath = project.files(android.getBootClasspath().join(File.pathSeparator)) + files(ext.androidJar)
114+
}
116115
options {
117116
links "http://docs.oracle.com/javase/7/docs/api/"
118117
linksOffline "http://developer.android.com/reference","${android.sdkDirectory}/docs/reference"
119-
}
120-
exclude '**/R.java'
121-
exclude 'com/unity3d/services/ar/view/GLSurfaceView.java'
122-
exclude 'com/unity3d/services/ar/api/AR.java'
123-
exclude 'com/unity3d/services/ar/view/ARView.java'
124-
exclude 'com/unity3d/services/ar/view/ARViewHandler.java'
125-
destinationDir = file("../javadoc/")
126118
}
119+
exclude '**/R.java'
120+
exclude 'com/unity3d/services/ar/view/GLSurfaceView.java'
121+
exclude 'com/unity3d/services/ar/api/AR.java'
122+
exclude 'com/unity3d/services/ar/view/ARView.java'
123+
exclude 'com/unity3d/services/ar/view/ARViewHandler.java'
124+
destinationDir = file("../javadoc/")
125+
}
127126

128127
task androidJavadocsJar(type: Jar, dependsOn: javadoc) {
129128
classifier = "javadoc"

‎unity-ads/src/androidTest/java/com/unity3d/ads/test/InstrumentationTestSuite.java

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,20 @@
11
package com.unity3d.ads.test;
22

3-
import com.unity3d.ads.test.instrumentation.services.ads.load.LoadModuleTest;
3+
import com.unity3d.ads.test.instrumentation.services.ads.operation.AdOperationTests;
4+
import com.unity3d.ads.test.instrumentation.services.ads.operation.LoadModuleDecoratorInitializationBufferTests;
5+
import com.unity3d.ads.test.instrumentation.services.ads.operation.LoadModuleDecoratorTests;
6+
import com.unity3d.ads.test.instrumentation.services.ads.operation.LoadModuleDecoratorTimeoutTests;
7+
import com.unity3d.ads.test.instrumentation.services.ads.operation.LoadModuleTests;
8+
import com.unity3d.ads.test.instrumentation.services.ads.operation.LoadOperationTests;
9+
import com.unity3d.ads.test.instrumentation.services.ads.operation.ShowModuleTests;
410
import com.unity3d.ads.test.instrumentation.services.ads.properties.AdsPropertiesTests;
511
import com.unity3d.ads.test.instrumentation.services.ads.webplayer.WebPlayerViewCacheTest;
612
import com.unity3d.ads.test.instrumentation.services.ads.webplayer.WebPlayerViewSettingsCacheTest;
713
import com.unity3d.ads.test.instrumentation.services.banners.BannerViewCacheTests;
814
import com.unity3d.ads.test.instrumentation.services.core.configuration.InitializationNotificationCenterTest;
15+
import com.unity3d.ads.test.instrumentation.services.core.webview.bridge.WebViewBridgeSharedObjectTests;
16+
import com.unity3d.ads.test.instrumentation.services.core.webview.bridge.invocation.WebViewBridgeInvocationTests;
17+
import com.unity3d.ads.test.legacy.ConfigurationTest;
918
import com.unity3d.services.analytics.AcquisitionTypeTest;
1019
import com.unity3d.services.analytics.UnityAnalyticsTest;
1120

@@ -18,11 +27,20 @@
1827
AcquisitionTypeTest.class,
1928
AdsPropertiesTests.class,
2029
InitializationNotificationCenterTest.class,
21-
LoadModuleTest.class,
2230
// LoadBridgeTest.class,
2331
WebPlayerViewSettingsCacheTest.class,
2432
WebPlayerViewCacheTest.class,
25-
BannerViewCacheTests.class
33+
BannerViewCacheTests.class,
34+
WebViewBridgeSharedObjectTests.class,
35+
WebViewBridgeInvocationTests.class,
36+
LoadOperationTests.class,
37+
LoadModuleTests.class,
38+
LoadModuleDecoratorTimeoutTests.class,
39+
LoadModuleDecoratorTests.class,
40+
LoadModuleDecoratorInitializationBufferTests.class,
41+
AdOperationTests.class,
42+
ShowModuleTests.class,
43+
ConfigurationTest.class
2644
})
2745

2846
public class InstrumentationTestSuite {}

‎unity-ads/src/androidTest/java/com/unity3d/ads/test/TestUtilities.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,4 +60,9 @@ public static <T> T[] concat(T[] first, T[] second) {
6060
return result;
6161
}
6262

63+
public static void SleepCurrentThread(int timeInMilliseconds) {
64+
try {
65+
Thread.sleep(timeInMilliseconds);
66+
} catch (InterruptedException e) { }
67+
}
6368
}

0 commit comments

Comments
 (0)