Merge remote-tracking branch 'upstream/master'

.gitignore

@@ -7,6 +7,7 @@ captures
 testServerAddress.txt
 app/bin
 unity-ads/bin
+libs
 javadoc
 .settings
 .project

LICENSE

@@ -1,4 +1,4 @@
-Unity Advertisements © 2020 Unity Technologies SF
-Your use of the Unity Technologies SF ("Unity') software known as "Unity Advertisements" is subject to the Unity Monetization Services Terms of Service linked to and copied immediately below.
-[Unity Monetization Services TOS](https://unity3d.com/legal/monetization-services-terms-of-service)
-Your use of the Unity Advertisements software constitutes your acceptance of such terms. Unless expressly provided otherwise, the software under this license is made available strictly on an "AS IS" BASIS WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED. Please review the license for details on these and other terms and conditions.
+Unity Advertisements copyright © 2021 Unity Technologies.
+This software is subject to, and made available under, the terms of service for Operate Solutions (see https://unity3d.com/legal/one-operate-services-terms-of-service), and is an "Operate Service" as defined therein.
+
+Your use of the Services constitutes your acceptance of such terms. Unless expressly provided otherwise, the software under this license is made available strictly on an "AS IS" BASIS WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED. Please review the terms of service for details on these and other terms and conditions.

README.md

@@ -1,19 +1,18 @@
-# Unity Ads 3 Android Release Repository
+# Unity Ads Android Release Repository
 
-Welcome to the Unity Ads 3 Android release repository.
+Welcome to the Unity Ads Android SDK Repository.
 
 ## Binaries
 
-Binaries can be found from the [releases tab](https://github.com/Unity-Technologies/unity-ads-android/releases).
+Binaries can be found in the [releases tab](https://github.com/Unity-Technologies/unity-ads-android/releases).
 
 ## Integration Guide
 
-Integration guide can be found [here](https://github.com/Unity-Technologies/unity-ads-android/wiki/sdk_android_integration_guide). There is [integration tutorial video](https://www.youtube.com/watch?v=MNdJ0KWlYPw) on YouTube.
+Integration guide can be found [here](https://unityads.unity3d.com/help/android/integration-guide-android).
 
 ## API Reference
 
-API Reference can be found [here](https://github.com/Unity-Technologies/unity-ads-android/wiki/sdk_android_api_reference)
+API Reference can be found [here](https://unityads.unity3d.com/help/android/api-android)
 
-## Transition guide from Unity Ads 1.5
-
-Transition guide from Unity Ads 1.5 can be found [here](https://github.com/Unity-Technologies/unity-ads-android/wiki/sdk_android_transition_guide)
+## License
+The license can be viewed [here](LICENSE)

app/build.gradle

@@ -2,24 +2,13 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 30
-    buildToolsVersion '28.0.2'
 
     defaultConfig {
         applicationId "com.unity3d.ads.example"
         minSdkVersion 19
         targetSdkVersion 30
-        versionCode = 3510
-        versionName = "3.5.1"
-    }
-
-    flavorDimensions "arEnabled"
-    productFlavors {
-        ar {
-            dimension "arEnabled"
-        }
-        vanilla {
-            dimension "arEnabled"
-        }
+        versionCode = 4100
+        versionName = "4.1.0"
     }
 
     buildTypes {
@@ -28,18 +17,12 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_7
-        targetCompatibility JavaVersion.VERSION_1_7
-    }
 }
 
 dependencies {
-    implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation 'com.android.support:appcompat-v7:26.1.0'
-    implementation 'com.android.support:design:26.1.0'
-    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
-    implementation 'android.arch.lifecycle:extensions:1.1.1'
-    arImplementation 'com.google.ar:core:1.4.0'
+    implementation "com.google.android.material:material:1.3.0"
+    implementation "androidx.appcompat:appcompat:1.3.0"
+    implementation "androidx.coordinatorlayout:coordinatorlayout:1.1.0"
+    implementation 'androidx.transition:transition:1.4.1'
     implementation project(':unity-ads')
-}
+}

app/src/main/AndroidManifest.xml

@@ -17,10 +17,6 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-
-        <meta-data
-            android:name="com.google.ar.core"
-            android:value="optional" />
     </application>
 
 </manifest>

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

@@ -1,15 +1,9 @@
 package com.unity3d.ads.example;
 
 import android.os.Bundle;
-import android.support.design.widget.FloatingActionButton;
-import android.support.design.widget.Snackbar;
-import android.support.design.widget.TabLayout;
-import android.support.v4.view.ViewPager;
-import android.support.v7.app.AppCompatActivity;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.View;
-
+import androidx.viewpager.widget.ViewPager;
+import androidx.appcompat.app.AppCompatActivity;
+import com.google.android.material.tabs.TabLayout;
 import com.unity3d.ads.example.ui.main.SectionsPagerAdapter;
 
 public class UnityAdsTestApp extends AppCompatActivity {