升级版本1.2.2

AnJoiner · Jun 1, 2022 · b0cd031 · b0cd031
1 parent 931ac12
commit b0cd031
Show file tree

Hide file tree

Showing 10 changed files with 46 additions and 39 deletions.
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -56,14 +56,14 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
-    testImplementation 'junit:junit:4.13.1'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
-//    implementation project(path: ':ffmpeg')
-    implementation 'com.github.AnJoiner:FFmpegCommand:1.2.1'
-    implementation 'androidx.recyclerview:recyclerview:1.1.0'
+    implementation 'androidx.appcompat:appcompat:1.4.1'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
+    testImplementation 'junit:junit:4.13.2'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
+    implementation project(path: ':ffmpeg')
+//    implementation 'com.github.AnJoiner:FFmpegCommand:1.2.1'
+    implementation 'androidx.recyclerview:recyclerview:1.2.1'
     // 腾讯bugly
     implementation 'com.tencent.bugly:crashreport:3.3.1'
     implementation 'com.tencent.bugly:nativecrashreport:3.7.500'

diff --git a/build.gradle b/build.gradle
@@ -2,17 +2,22 @@
 
 buildscript {
 //    ext.kotlin_version = '1.4.20'
-    ext.kotlin_version = '1.6.20'
+    ext.kotlin_version = '1.6.21'
 
     repositories {
-        gradlePluginPortal()
+//        gradlePluginPortal()
+//        google()
+//        maven { url 'https://jitpack.io' }
+//        maven {
+//            url 'https://maven.aliyun.com/repository/public/'
+//        }
+//        mavenLocal()
+//        mavenCentral()
+        maven {url 'https://maven.aliyun.com/repository/gradle-plugin'}
+        maven { url 'https://maven.aliyun.com/repository/public'}
         google()
-        maven { url 'https://jitpack.io' }
-        maven {
-            url 'https://maven.aliyun.com/repository/public/'
-        }
-        mavenLocal()
         mavenCentral()
+        maven { url 'https://jitpack.io' }
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:7.1.3'
@@ -25,14 +30,19 @@ buildscript {
 
 allprojects {
     repositories {
-        gradlePluginPortal()
+//        gradlePluginPortal()
+//        google()
+//        maven { url 'https://jitpack.io' }
+//        maven {
+//            url 'https://maven.aliyun.com/repository/public/'
+//        }
+//        mavenLocal()
+//        mavenCentral()
+        maven {url 'https://maven.aliyun.com/repository/gradle-plugin'}
+        maven { url 'https://maven.aliyun.com/repository/public'}
         google()
-        maven { url 'https://jitpack.io' }
-        maven {
-            url 'https://maven.aliyun.com/repository/public/'
-        }
-        mavenLocal()
         mavenCentral()
+        maven { url 'https://jitpack.io' }
     }
 }
 

diff --git a/ffmpeg/build.gradle b/ffmpeg/build.gradle
@@ -25,11 +25,11 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
-    implementation 'androidx.appcompat:appcompat:1.1.0'
-    testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
-    implementation "androidx.core:core-ktx:+"
+    implementation 'androidx.appcompat:appcompat:1.4.1'
+    testImplementation 'junit:junit:4.13.2'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
+    implementation "androidx.core:core-ktx:1.7.0"
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 
 //    apply from: 'nexus.gradle'

diff --git a/ffmpeg/src/main/jniLibs/arm64-v8a/libffmpeg-command.so b/ffmpeg/src/main/jniLibs/arm64-v8a/libffmpeg-command.so
diff --git a/ffmpeg/src/main/jniLibs/arm64-v8a/libffmpeg-org.so b/ffmpeg/src/main/jniLibs/arm64-v8a/libffmpeg-org.so
diff --git a/ffmpeg/src/main/jniLibs/armeabi-v7a/libffmpeg-command.so b/ffmpeg/src/main/jniLibs/armeabi-v7a/libffmpeg-command.so
diff --git a/ffmpeg/src/main/jniLibs/armeabi-v7a/libffmpeg-org.so b/ffmpeg/src/main/jniLibs/armeabi-v7a/libffmpeg-org.so