gradlew check finishes successfully

Author: robertjcolley

android/memoryleaktest/build.gradle

@@ -4,11 +4,11 @@ apply plugin: 'kotlin-android'
 android {
     flavorDimensions "target_platform"
 
-    compileSdkVersion 31
+    compileSdkVersion 33
     defaultConfig {
         applicationId "com.example.memoryleaktest"
         minSdkVersion 24
-        targetSdkVersion 31
+        targetSdkVersion 33
         versionCode 1
         versionName "1.0"
 

android/memoryleaktest/src/main/AndroidManifest.xml

@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.example.memoryleaktest">
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
 
+    <uses-feature
+        android:name="android.hardware.camera"
+        android:required="true" />
     <queries>
         <package android:name="com.google.ar.core" />
     </queries>

android/nativetest/build.gradle

@@ -2,12 +2,12 @@ apply plugin: 'com.android.application'
 
 android {
     flavorDimensions "target_platform"
-    compileSdkVersion 31
+    compileSdkVersion 33
 
     defaultConfig {
         applicationId "com.viro.nativetest"
         minSdkVersion 24
-        targetSdkVersion 31
+        targetSdkVersion 33
         versionCode 1
         versionName "1.0"
         missingDimensionStrategy 'product', 'viro_core'

android/nativetest/src/main/AndroidManifest.xml

@@ -2,13 +2,17 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="com.viromedia.nativetest">
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
 
+    <uses-feature
+        android:name="android.hardware.camera"
+        android:required="true" />
     <queries>
         <package android:name="com.google.ar.core" />
     </queries>
 
     <!-- Required to read the paired viewer's distortion parameters -->
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+<!--    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />-->
 
     <!-- Required for AR -->
     <uses-permission android:name="android.permission.CAMERA" />

android/releasetest/build.gradle

@@ -3,12 +3,12 @@ apply plugin: 'kotlin-android'
 
 android {
     flavorDimensions "target_platform"
-    compileSdkVersion 31
+    compileSdkVersion 33
 
     defaultConfig {
         applicationId "com.viromedia.releasetest"
         minSdkVersion 24
-        targetSdkVersion 31
+        targetSdkVersion 33
         versionCode 1
         versionName "1.0"
 

android/releasetest/src/main/AndroidManifest.xml

@@ -2,13 +2,17 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="com.viromedia.releasetest">
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
 
+    <uses-feature
+        android:name="android.hardware.camera"
+        android:required="true" />
     <queries>
         <package android:name="com.google.ar.core"/>
     </queries>
 
     <!-- Required to read the paired viewer's distortion parameters -->
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+<!--    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />-->
 
     <!-- Required for AR -->
     <uses-permission android:name="android.permission.CAMERA" />

android/renderertest/build.gradle

@@ -2,12 +2,12 @@ apply plugin: 'com.android.application'
 
 android {
     flavorDimensions "target_platform"
-    compileSdkVersion 31
+    compileSdkVersion 33
 
     defaultConfig {
         applicationId "com.viromedia.renderertest"
         minSdkVersion 24
-        targetSdkVersion 31
+        targetSdkVersion 33
         versionCode 1
         versionName "1.0"
         missingDimensionStrategy 'product', 'viro_core'

android/renderertest/src/main/AndroidManifest.xml

@@ -2,15 +2,19 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="com.viromedia.renderertest">
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
 
+    <uses-feature
+        android:name="android.hardware.camera"
+        android:required="true" />
     <queries>
         <package android:name="com.google.ar.core" />
     </queries>
 
     <uses-permission android:name="android.permission.INTERNET" />
 
     <!-- Required to read the paired viewer's distortion parameters -->
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <!--    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />-->
 
     <!-- Required for AR -->
     <uses-permission android:name="android.permission.CAMERA" />

android/sharedCode/src/main/AndroidManifest.xml

@@ -8,7 +8,7 @@
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.VIBRATE"/>
     <!-- Required to read the paired viewer's distortion parameters. -->
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+<!--    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>-->
     <!-- Required for Recording -->
     <uses-permission android:name="android.permission.RECORD_AUDIO" />
 

android/sharedCode/src/main/java/com/viro/core/internal/AVPlayer.java

@@ -33,6 +33,7 @@
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.DefaultLoadControl;
 import com.google.android.exoplayer2.ExoPlayer;
+import com.google.android.exoplayer2.MediaItem;
 import com.google.android.exoplayer2.PlaybackException;
 import com.google.android.exoplayer2.Player;
 import com.google.android.exoplayer2.SimpleExoPlayer;
@@ -71,7 +72,7 @@ private enum State {
         STARTED,
     }
 
-    private final SimpleExoPlayer mExoPlayer;
+    private final ExoPlayer mExoPlayer;
     private float mVolume;
     private final long mNativeReference;
     private boolean mLoop;
@@ -88,13 +89,12 @@ public AVPlayer(long nativeReference, Context context) {
         mMute = false;
 
         AdaptiveTrackSelection.Factory trackSelectionFactory = new AdaptiveTrackSelection.Factory();
-        DefaultTrackSelector trackSelector = new DefaultTrackSelector(trackSelectionFactory);
-        mExoPlayer = new SimpleExoPlayer.Builder(context).setTrackSelector(trackSelector).setLoadControl(new DefaultLoadControl()).build();
-
-        mExoPlayer.addListener(new Player.EventListener() {
+        DefaultTrackSelector trackSelector = new DefaultTrackSelector(context, trackSelectionFactory);
+        mExoPlayer = new ExoPlayer.Builder(context).setTrackSelector(trackSelector).setLoadControl(new DefaultLoadControl()).build();
 
+        mExoPlayer.addListener(new Player.Listener() {
             @Override
-            public void onPlayerStateChanged(boolean playWhenReady, int playbackState) {
+            public void onPlaybackStateChanged(@Player.State int playbackState) {
                 // this function sometimes gets called back w/ the same playbackState.
                 if (mPrevExoPlayerState == playbackState) {
                     return;
@@ -175,34 +175,34 @@ public DataSource createDataSource() {
     private MediaSource buildMediaSource(Uri uri, DataSource.Factory mediaDataSourceFactory, ExtractorsFactory extractorsFactory) {
         int type = inferContentType(uri);
         switch (type) {
-            case C.TYPE_SS:
-                return new SsMediaSource.Factory(mediaDataSourceFactory).createMediaSource(uri);
-            case C.TYPE_DASH:
-                return new DashMediaSource.Factory(mediaDataSourceFactory).createMediaSource(uri);
-            case C.TYPE_HLS:
-                return new HlsMediaSource.Factory(mediaDataSourceFactory).createMediaSource(uri);
+            case C.CONTENT_TYPE_SS:
+                return new SsMediaSource.Factory(mediaDataSourceFactory).createMediaSource(MediaItem.fromUri(uri));
+            case C.CONTENT_TYPE_DASH:
+                return new DashMediaSource.Factory(mediaDataSourceFactory).createMediaSource(MediaItem.fromUri(uri));
+            case C.CONTENT_TYPE_HLS:
+                return new HlsMediaSource.Factory(mediaDataSourceFactory).createMediaSource(MediaItem.fromUri(uri));
             default:
                 // Return an ExtraMediaSource as default.
-                return new ProgressiveMediaSource.Factory(mediaDataSourceFactory, extractorsFactory).createMediaSource(uri);
+                return new ProgressiveMediaSource.Factory(mediaDataSourceFactory, extractorsFactory).createMediaSource(MediaItem.fromUri(uri));
         }
     }
 
     private int inferContentType(Uri uri) {
         String path = uri.getPath();
-        return path == null ? C.TYPE_OTHER : inferContentType(path);
+        return path == null ? C.CONTENT_TYPE_OTHER : inferContentType(path);
     }
 
     private int inferContentType(String fileName) {
         fileName = Ascii.toLowerCase(fileName);
         if (fileName.endsWith(".mpd")) {
-            return C.TYPE_DASH;
+            return C.CONTENT_TYPE_DASH;
         } else if (fileName.endsWith(".m3u8")) {
-            return C.TYPE_HLS;
+            return C.CONTENT_TYPE_HLS;
         } else if (fileName.endsWith(".ism") || fileName.endsWith(".isml")
                 || fileName.endsWith(".ism/manifest") || fileName.endsWith(".isml/manifest")) {
-            return C.TYPE_SS;
+            return C.CONTENT_TYPE_SS;
         } else {
-            return C.TYPE_OTHER;
+            return C.CONTENT_TYPE_OTHER;
         }
     }