升级环境

AnJoiner · May 5, 2022 · 931ac12 · 931ac12
1 parent f042e0a
commit 931ac12
Show file tree

Hide file tree

Showing 13 changed files with 45 additions and 24 deletions.
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -20,12 +20,11 @@ android {
 
     }
 
-    compileSdkVersion 29
-    buildToolsVersion "29.0.2"
+    compileSdkVersion 31
     defaultConfig {
         applicationId "com.coder.ffmpegtest"
         minSdkVersion 15
-        targetSdkVersion 29
+        targetSdkVersion 31
         versionCode 4
         versionName "1.2.3"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -19,6 +19,7 @@
         android:networkSecurityConfig="@xml/network_security_config"
         android:theme="@style/AppTheme">
         <activity android:name=".ui.MainActivity"
+            android:exported="true"
             android:screenOrientation="portrait">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

diff --git a/app/src/main/java/com/coder/ffmpegtest/service/FFmpegCommandService.kt b/app/src/main/java/com/coder/ffmpegtest/service/FFmpegCommandService.kt
@@ -67,7 +67,7 @@ class FFmpegCommandService : IntentService("") {
             }
 
             override fun onError(errorCode: Int, errorMsg: String?) {
-                Log.d("FFmpegCmd", errorMsg)
+                Log.d("FFmpegCmd", errorMsg+"")
             }
         }
     }

diff --git a/app/src/main/java/com/coder/ffmpegtest/ui/KFFmpegCommandActivity.kt b/app/src/main/java/com/coder/ffmpegtest/ui/KFFmpegCommandActivity.kt
@@ -566,7 +566,7 @@ class KFFmpegCommandActivity : AppCompatActivity() {
             }
 
             override fun onError(errorCode: Int, errorMsg: String?) {
-                Log.d("FFmpegCmd", errorMsg)
+                Log.d("FFmpegCmd", errorMsg+"")
                 runOnUiThread {
                     ToastUtils.show(errorMsg)
                     mErrorDialog?.setContent(0)

diff --git a/build.gradle b/build.gradle
@@ -2,14 +2,20 @@
 
 buildscript {
 //    ext.kotlin_version = '1.4.20'
-    ext.kotlin_version = '1.4.32'
+    ext.kotlin_version = '1.6.20'
 
     repositories {
+        gradlePluginPortal()
         google()
-        jcenter()
+        maven { url 'https://jitpack.io' }
+        maven {
+            url 'https://maven.aliyun.com/repository/public/'
+        }
+        mavenLocal()
+        mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.1'
+        classpath 'com.android.tools.build:gradle:7.1.3'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -19,12 +25,14 @@ buildscript {
 
 allprojects {
     repositories {
+        gradlePluginPortal()
         google()
-        jcenter()
         maven { url 'https://jitpack.io' }
-        maven{
-            url 'http://www.readdown.com:8081/repository/maven-releases/'
+        maven {
+            url 'https://maven.aliyun.com/repository/public/'
         }
+        mavenLocal()
+        mavenCentral()
     }
 }
 

diff --git a/ffmpeg/build.gradle b/ffmpeg/build.gradle
@@ -2,15 +2,12 @@ apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 
 android {
-    compileSdkVersion 29
-    buildToolsVersion "29.0.2"
+    compileSdkVersion 31
 
 
     defaultConfig {
         minSdkVersion 15
-        targetSdkVersion 29
-        versionCode 1
-        versionName "1.0"
+        targetSdkVersion 31
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles 'consumer-rules.pro'
@@ -35,7 +32,7 @@ dependencies {
     implementation "androidx.core:core-ktx:+"
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 
-    apply from: 'nexus.gradle'
+//    apply from: 'nexus.gradle'
 //    apply from: 'nexus-lite.gradle'
 }
 repositories {

diff --git a/ffmpeg/nexus-lite.gradle b/ffmpeg/nexus-lite.gradle
@@ -1,4 +1,4 @@
-apply plugin: 'maven'
+apply plugin: 'maven-publish'
 
 
 task androidJavadocs(type: Javadoc) {

diff --git a/ffmpeg/nexus.gradle b/ffmpeg/nexus.gradle
@@ -1,4 +1,4 @@
-apply plugin: 'maven'
+apply plugin: 'maven-publish'
 
 
 task androidJavadocs(type: Javadoc) {

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
-Original file line number
+Diff line change
@@ Expand Up / @@ -67,7 +67,7 @@ class FFmpegCommandService : IntentService("") { @@
                 }
                 override fun onError(errorCode: Int, errorMsg: String?) {
-                    Log.d("FFmpegCmd", errorMsg)
+                    Log.d("FFmpegCmd", errorMsg+"")
                 }
             }
         }
@@ Expand Down @@