Rollback of https://github.com/google/ExoPlayer/commit/bbe681a904d58fe1f84f6c7c6e3390d932c86249

*** Original commit ***

Make Kotlin JVM annotations available and use in ExoPlayer.

NoExternal

***

PiperOrigin-RevId: 262323737

constants.gradle

@@ -25,7 +25,6 @@ project.ext {
     autoServiceVersion = '1.0-rc4'
     autoServiceVersion = '1.0-rc4'
     checkerframeworkVersion = '2.5.0'
     checkerframeworkVersion = '2.5.0'
     jsr305Version = '3.0.2'
     jsr305Version = '3.0.2'
-    kotlinAnnotationsVersion = '1.3.31'
     androidXTestVersion = '1.1.0'
     androidXTestVersion = '1.1.0'
     truthVersion = '0.44'
     truthVersion = '0.44'
     modulePrefix = ':'
     modulePrefix = ':'

library/core/build.gradle

@@ -62,7 +62,8 @@ dependencies {
     compileOnly 'com.google.code.findbugs:jsr305:' + jsr305Version
     compileOnly 'com.google.code.findbugs:jsr305:' + jsr305Version
     compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion
     compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion
     compileOnly 'org.checkerframework:checker-compat-qual:' + checkerframeworkVersion
     compileOnly 'org.checkerframework:checker-compat-qual:' + checkerframeworkVersion
-    compileOnly 'org.jetbrains.kotlin:kotlin-annotations-jvm:' + kotlinAnnotationsVersion
+    // Uncomment to enable Kotlin non-null strict mode. See [internal: b/138703808].
+    // compileOnly "org.jetbrains.kotlin:kotlin-annotations-jvm:1.1.60"
     androidTestImplementation 'androidx.test:runner:' + androidXTestVersion
     androidTestImplementation 'androidx.test:runner:' + androidXTestVersion
     androidTestImplementation 'androidx.test.ext:junit:' + androidXTestVersion
     androidTestImplementation 'androidx.test.ext:junit:' + androidXTestVersion
     androidTestImplementation 'com.google.truth:truth:' + truthVersion
     androidTestImplementation 'com.google.truth:truth:' + truthVersion

library/core/proguard-rules.txt

@@ -58,6 +58,5 @@
   <init>(com.google.android.exoplayer2.upstream.DataSource$Factory);
   <init>(com.google.android.exoplayer2.upstream.DataSource$Factory);
 }
 }
 
 
-# Don't warn about checkerframework and Kotlin annotations
+# Don't warn about checkerframework
 -dontwarn org.checkerframework.**
 -dontwarn org.checkerframework.**
--dontwarn kotlin.annotations.jvm.**

library/core/src/main/java/com/google/android/exoplayer2/util/NonNullApi.java

@@ -20,8 +20,8 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.RetentionPolicy;
 import javax.annotation.Nonnull;
 import javax.annotation.Nonnull;
 import javax.annotation.meta.TypeQualifierDefault;
 import javax.annotation.meta.TypeQualifierDefault;
-import kotlin.annotations.jvm.MigrationStatus;
-import kotlin.annotations.jvm.UnderMigration;
+// import kotlin.annotations.jvm.MigrationStatus;
+// import kotlin.annotations.jvm.UnderMigration;
 
 
 /**
 /**
  * Annotation to declare all type usages in the annotated instance as {@link Nonnull}, unless
  * Annotation to declare all type usages in the annotated instance as {@link Nonnull}, unless
@@ -29,6 +29,8 @@ import kotlin.annotations.jvm.UnderMigration;
  */
  */
 @Nonnull
 @Nonnull
 @TypeQualifierDefault(ElementType.TYPE_USE)
 @TypeQualifierDefault(ElementType.TYPE_USE)
-@UnderMigration(status = MigrationStatus.STRICT)
+// TODO(internal: b/138703808): Uncomment to ensure Kotlin issues compiler errors when non-null
+// types are used incorrectly.
+// @UnderMigration(status = MigrationStatus.STRICT)
 @Retention(RetentionPolicy.CLASS)
 @Retention(RetentionPolicy.CLASS)
 public @interface NonNullApi {}
 public @interface NonNullApi {}