remove bintary

maiwenchang · Mar 16, 2022 · 7c11db1 · 7c11db1
1 parent 12c7b25
commit 7c11db1
Show file tree

Hide file tree

Showing 9 changed files with 32 additions and 18 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -57,10 +57,10 @@ android {
 
     dependencies {
         implementation fileTree(include: ['*.jar'], dir: 'libs')
-        implementation "androidx.appcompat:appcompat:$androidxLibraryVersion"
+        implementation "androidx.appcompat:appcompat:$compactVersion"
         //design
-        implementation "com.google.android.material:material:$androidxLibraryVersion"
-        implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+        implementation "com.google.android.material:material:1.5.0"
+        implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
         //FlexboxLayout
         implementation 'com.google.android:flexbox:1.0.0'
         androidTestImplementation 'com.android.support.test:runner:1.0.2'
@@ -85,11 +85,17 @@ android {
     }
 }
 dependencies {
-    implementation "androidx.core:core-ktx:+"
+    implementation "androidx.core:core-ktx:$ktx_version"
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 }
 repositories {
     google()
     mavenCentral()
 }
 
+configurations.all {
+    resolutionStrategy {
+        force "androidx.core:core-ktx:$ktx_version"
+    }
+}
+
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -20,6 +20,7 @@
             android:launchMode="singleTask"
             android:label="@string/app_name"
             android:screenOrientation="portrait"
+            android:exported="true"
             android:theme="@style/AppTheme.NoActionBar">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

diff --git a/artplayer-core/build.gradle b/artplayer-core/build.gradle
@@ -47,10 +47,14 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 
-    implementation "androidx.appcompat:appcompat:$androidxLibraryVersion"
+    implementation "androidx.appcompat:appcompat:$compactVersion"
     implementation "androidx.core:core-ktx:$ktx_version"
     implementation "androidx.activity:activity-ktx:$ktx_version"
 }
-
+configurations.all {
+    resolutionStrategy {
+        force "androidx.core:core-ktx:$ktx_version"
+    }
+}
 //apply from: './bintary_push.gradle'
 
diff --git a/artplayer-core/src/main/java/org/salient/artplayer/ui/ResizeTextureView.kt b/artplayer-core/src/main/java/org/salient/artplayer/ui/ResizeTextureView.kt
@@ -18,8 +18,10 @@ class ResizeTextureView : TextureView {
     private var mVideoHeight = 0
     private var screenType: ScaleType = ScaleType.DEFAULT
 
-    constructor(context: Context?) : super(context) {}
-    constructor(context: Context?, attrs: AttributeSet?) : super(context, attrs) {}
+    constructor(context: Context) : super(context) {
+
+    }
+    constructor(context: Context, attrs: AttributeSet?) : super(context, attrs) {}
 
     fun setVideoSize(width: Int, height: Int) {
         mVideoWidth = width

diff --git a/artplayer-core/src/main/java/org/salient/artplayer/ui/VideoView.kt b/artplayer-core/src/main/java/org/salient/artplayer/ui/VideoView.kt
@@ -222,14 +222,14 @@ open class VideoView : FrameLayout, IVideoView {
             this.surfaceTexture = surfaceTexture
             attach()
         } else if (textureView?.surfaceTexture != surfaceTexture) {
-            textureView?.surfaceTexture = surfaceTexture
+            textureView?.setSurfaceTexture(surfaceTexture)
         }
     }
 
     override fun onSurfaceTextureSizeChanged(surfaceTexture: SurfaceTexture, width: Int, height: Int) {
         Log.d(TAG, "onSurfaceTextureSizeChanged() called with: surfaceTexture = $surfaceTexture, width = $width, height = $height")
         if (textureView?.surfaceTexture != surfaceTexture) {
-            textureView?.surfaceTexture = surfaceTexture
+            textureView?.setSurfaceTexture(surfaceTexture)
         }
     }
 
@@ -241,7 +241,7 @@ open class VideoView : FrameLayout, IVideoView {
 
     override fun onSurfaceTextureUpdated(surfaceTexture: SurfaceTexture) {
         if (textureView?.surfaceTexture != surfaceTexture) {
-            textureView?.surfaceTexture = surfaceTexture
+            textureView?.setSurfaceTexture(surfaceTexture)
         }
     }
 

diff --git a/artplayer-exo/build.gradle b/artplayer-exo/build.gradle
@@ -38,7 +38,7 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
-    implementation("androidx.appcompat:appcompat:$androidxLibraryVersion")
+    implementation("androidx.appcompat:appcompat:$compactVersion")
 
     api("com.google.android.exoplayer:exoplayer:$exoPlayerVersion")
     api("com.google.android.exoplayer:extension-rtmp:$exoPlayerVersion")

diff --git a/artplayer-ijk/build.gradle b/artplayer-ijk/build.gradle
@@ -34,7 +34,7 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation "androidx.appcompat:appcompat:$androidxLibraryVersion"
+    implementation "androidx.appcompat:appcompat:$compactVersion"
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 
     implementation project(':artplayer-core')

diff --git a/artplayer-ui/build.gradle b/artplayer-ui/build.gradle
@@ -32,7 +32,7 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    compileOnly "androidx.appcompat:appcompat:$androidxLibraryVersion"
+    compileOnly "androidx.appcompat:appcompat:$compactVersion"
     compileOnly project(':artplayer-core')
 }
 

diff --git a/build.gradle b/build.gradle
@@ -5,10 +5,10 @@ buildscript {
 
     ext {
         // App dependencies
-        compileSdkVersion = 29
+        compileSdkVersion = 31
         minSdkVersion = 21
-        targetSdkVersion = 29
-        androidxLibraryVersion = '1.1.0'
+        targetSdkVersion = 31
+        compactVersion = '1.1.0'
         ktx_version = '1.1.0'
         ijkPlayerVersion = '0.8.8'
         exoPlayerVersion = '2.11.3'
@@ -20,6 +20,7 @@ buildscript {
 
     repositories {
         google()
+        mavenCentral()
         jcenter()
     }
     dependencies {
@@ -34,8 +35,8 @@ buildscript {
 allprojects {
     repositories {
         google()
-        jcenter()
         mavenCentral()
+        jcenter()
     }
 
     // 解决 : bintray 上传如果注释中有中文，可能会出现：编码GBK的不可映射字符