diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 61a9130..fb7f4a8 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,6 +1,6 @@
-
+
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 8ae2473..4c83b34 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -4,9 +4,11 @@
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index 9da0a73..d6433b7 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -36,5 +36,20 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index ce9a290..cf994ae 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -28,7 +28,7 @@
-
+
diff --git a/app/build.gradle b/app/build.gradle
index bd6e1aa..a6e74f6 100644
--- 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
index f6b575d..84c2524 100644
--- 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">
diff --git a/app/src/main/java/com/coder/ffmpegtest/service/FFmpegCommandService.kt b/app/src/main/java/com/coder/ffmpegtest/service/FFmpegCommandService.kt
index 31c5676..480a9b6 100644
--- 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
index c73c2bc..5a5e8ed 100644
--- 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
index d3be479..0cde747 100644
--- 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
index 3ece183..dae06b8 100644
--- 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
index 0c1341f..5498c00 100644
--- 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
index 5301739..c79cbde 100644
--- 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
index a60e1e9..3704338 100644
--- 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