Merge branch 'dev'

# Conflicts:
#	app/build.gradle
#	build.gradle

app/build.gradle

@@ -13,15 +13,10 @@ android {
         versionName rootProject.ext.versionName
         applicationId "com.github.iielse.imageviewer.demo"
     }
-    buildFeatures {
-        viewBinding true
-    }
+    buildFeatures.viewBinding = true
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
-    }
-    kotlinOptions {
-        jvmTarget = "1.8"
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
     }
     buildTypes {
         release {
@@ -32,23 +27,23 @@ android {
 }
 
 dependencies {
-    implementation 'androidx.appcompat:appcompat:1.4.0'
-    implementation 'androidx.core:core-ktx:1.7.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.2'
+    implementation 'androidx.appcompat:appcompat:1.3.1'
+    implementation 'androidx.core:core-ktx:1.6.0'
+    implementation 'androidx.activity:activity-ktx:1.2.4'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.0'
     implementation 'androidx.recyclerview:recyclerview:1.2.1'
     implementation 'androidx.viewpager2:viewpager2:1.0.0'
     //noinspection GradleDependency
     implementation 'androidx.paging:paging-runtime-ktx:2.1.2'
-    implementation 'androidx.activity:activity-ktx:1.4.0'
 
     implementation 'com.github.bumptech.glide:glide:4.12.0'
     kapt 'com.github.bumptech.glide:compiler:4.12.0'
     implementation 'com.github.chrisbanes:PhotoView:2.2.0'
     implementation 'com.davemorrissey.labs:subsampling-scale-image-view:3.10.0'
-    implementation 'com.google.android.exoplayer:exoplayer:2.16.1'
+    implementation 'com.google.android.exoplayer:exoplayer:2.15.0'
 
-//    implementation project(':imageviewer')
-     implementation 'com.github.iielse:imageviewer:2.1.10'
+    implementation project(':imageviewer')
+//     implementation 'com.github.iielse:imageviewer:2.1.11'
     implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
     implementation 'io.reactivex.rxjava2:rxjava:2.2.19'
 }

build.gradle

@@ -8,8 +8,8 @@ buildscript {
         maven { url 'https://maven.google.com' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.3'
-        classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.31'
+        classpath 'com.android.tools.build:gradle:4.2.1'
+        classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.0'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
     }
 }
@@ -29,10 +29,10 @@ task clean(type: Delete) {
 
 
 ext {
-    compileSdkVersion= 31
+    compileSdkVersion= 30
     buildToolsVersion= "30.0.3"
     minSdkVersion    = 21
-    targetSdkVersion = 31
-    versionCode      = 220
-    versionName      = "2.1.10"
+    targetSdkVersion = 30
+    versionCode      = 221
+    versionName      = "2.1.11"
 }

gradle.properties

@@ -22,4 +22,4 @@ org.gradle.parallel=true
 org.gradle.daemon=true
 org.gradle.configureondemand=true
 org.gradle.caching=true
-android.enableJetifier=true
+android.enableJetifier=true

gradle/wrapper/gradle-wrapper.properties

@@ -1,4 +1,4 @@
-#Fri May 14 14:25:04 CST 2021
+#Wed Dec 01 19:34:04 CST 2021
 distributionBase=GRADLE_USER_HOME
 distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
 distributionPath=wrapper/dists

imageviewer/build.gradle

@@ -13,9 +13,7 @@ android {
         versionName rootProject.ext.versionName
     }
 
-    buildFeatures {
-        viewBinding true
-    }
+    buildFeatures.viewBinding = true
 
     kotlinOptions {
         jvmTarget = "1.8"
@@ -30,15 +28,15 @@ android {
 }
 
 dependencies {
-    implementation 'androidx.appcompat:appcompat:1.4.0'
-    implementation 'androidx.core:core-ktx:1.7.0'
+    implementation 'androidx.appcompat:appcompat:1.3.1'
+    implementation 'androidx.core:core-ktx:1.6.0'
     implementation 'androidx.transition:transition:1.4.1'
     implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
     //noinspection GradleDependency
     implementation 'androidx.paging:paging-runtime-ktx:2.1.2'
     implementation 'androidx.viewpager2:viewpager2:1.0.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.2'
-    implementation 'com.google.android.exoplayer:exoplayer:2.16.1'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.0'
+    implementation 'com.google.android.exoplayer:exoplayer:2.15.0'
     implementation 'com.github.chrisbanes:PhotoView:2.2.0'
     implementation 'com.davemorrissey.labs:subsampling-scale-image-view:3.10.0'
 }

imageviewer/src/main/java/com/github/iielse/imageviewer/widgets/video/ExoVideoView.kt

@@ -7,6 +7,7 @@ import com.github.iielse.imageviewer.utils.Config
 import com.google.android.exoplayer2.ExoPlayer
 import com.google.android.exoplayer2.MediaItem
 import com.google.android.exoplayer2.Player
+import com.google.android.exoplayer2.SimpleExoPlayer
 import com.google.android.exoplayer2.analytics.AnalyticsListener
 import com.google.android.exoplayer2.util.EventLogger
 import com.google.android.exoplayer2.video.VideoSize
@@ -26,7 +27,7 @@ open class ExoVideoView @JvmOverloads constructor(
     }
 
     private val logger by lazy { EventLogger(null) }
-    private var exoPlayer: ExoPlayer? = null
+    private var exoPlayer: SimpleExoPlayer? = null
     private var videoRenderedCallback: VideoRenderedListener? = null
     private val listeners = mutableListOf<AnalyticsListener>()
     private var playUrl: String? = null
@@ -96,7 +97,7 @@ open class ExoVideoView @JvmOverloads constructor(
 
     private fun newExoPlayer(): ExoPlayer {
         release()
-        return ExoPlayer.Builder(context).build().also {
+        return SimpleExoPlayer.Builder(context).build().also {
             it.setVideoTextureView(this)
             it.addListener(videoListener)
             if (Config.DEBUG) it.addAnalyticsListener(logger)