diff --git a/app/build.gradle b/app/build.gradle index 1c1c766..929a369 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,15 +1,14 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 26 - buildToolsVersion "26.0.0" + compileSdkVersion 29 defaultConfig { applicationId "com.vincent.videocompress" minSdkVersion 19 - targetSdkVersion 22 + targetSdkVersion 29 versionCode 1 versionName "1.0" - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' } buildTypes { release { @@ -20,12 +19,12 @@ android { } dependencies { - compile fileTree(include: ['*.jar'], dir: 'libs') - androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', { + implementation fileTree(include: ['*.jar'], dir: 'libs') + androidTestCompile('androidx.test.espresso:espresso-core:3.1.0', { exclude group: 'com.android.support', module: 'support-annotations' }) - compile 'com.android.support:appcompat-v7:26.+' - compile 'com.android.support.constraint:constraint-layout:1.0.2' - testCompile 'junit:junit:4.12' - compile project(':videocompressor') + implementation 'androidx.appcompat:appcompat:1.2.0' + implementation 'androidx.constraintlayout:constraintlayout:2.0.4' + testImplementation 'junit:junit:4.13.1' + implementation project(':videocompressor') } diff --git a/app/src/androidTest/java/com/vincent/videocompress/ExampleInstrumentedTest.java b/app/src/androidTest/java/com/vincent/videocompress/ExampleInstrumentedTest.java index f52c16c..8d2fc9b 100644 --- a/app/src/androidTest/java/com/vincent/videocompress/ExampleInstrumentedTest.java +++ b/app/src/androidTest/java/com/vincent/videocompress/ExampleInstrumentedTest.java @@ -1,8 +1,8 @@ package com.vincent.videocompress; import android.content.Context; -import android.support.test.InstrumentationRegistry; -import android.support.test.runner.AndroidJUnit4; +import androidx.test.platform.app.InstrumentationRegistry; +import androidx.test.ext.junit.runners.AndroidJUnit4; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/app/src/main/java/com/vincent/videocompress/MainActivity.java b/app/src/main/java/com/vincent/videocompress/MainActivity.java index eb7f49c..2b658af 100644 --- a/app/src/main/java/com/vincent/videocompress/MainActivity.java +++ b/app/src/main/java/com/vincent/videocompress/MainActivity.java @@ -3,12 +3,10 @@ import android.annotation.TargetApi; import android.content.Intent; import android.content.res.Configuration; -import android.database.Cursor; -import android.net.Uri; import android.os.Build; import android.os.Environment; -import android.support.annotation.Nullable; -import android.support.v7.app.AppCompatActivity; +import androidx.annotation.Nullable; +import androidx.appcompat.app.AppCompatActivity; import android.os.Bundle; import android.view.View; import android.widget.Button; diff --git a/build.gradle b/build.gradle index c2eea8e..c95742a 100644 --- a/build.gradle +++ b/build.gradle @@ -3,9 +3,10 @@ buildscript { repositories { jcenter() + google() } dependencies { - classpath 'com.android.tools.build:gradle:2.3.3' + classpath 'com.android.tools.build:gradle:4.1.1' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files @@ -15,6 +16,7 @@ buildscript { allprojects { repositories { jcenter() + google() } } diff --git a/gradle.properties b/gradle.properties index aac7c9b..26868c8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -10,6 +10,9 @@ # Specifies the JVM arguments used for the daemon process. # The setting is particularly useful for tweaking memory settings. org.gradle.jvmargs=-Xmx1536m +android.injected.testOnly=false +android.useAndroidX=true +android.enableJetifier=true # When configured, Gradle will run in incubating parallel mode. # This option should only be used with decoupled projects. More details, visit diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 6a3ac94..342701c 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Aug 16 15:02:11 CST 2017 +#Tue Apr 27 09:49:05 CST 2021 distributionBase=GRADLE_USER_HOME +distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip distributionPath=wrapper/dists -zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip +zipStoreBase=GRADLE_USER_HOME diff --git a/videocompressor/build.gradle b/videocompressor/build.gradle index 2c81d5e..f2e4496 100644 --- a/videocompressor/build.gradle +++ b/videocompressor/build.gradle @@ -1,16 +1,14 @@ apply plugin: 'com.android.library' android { - compileSdkVersion 26 - buildToolsVersion "26.0.0" - + compileSdkVersion 29 defaultConfig { minSdkVersion 15 - targetSdkVersion 26 + targetSdkVersion 29 versionCode 1 versionName "1.0" - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' } buildTypes { @@ -22,12 +20,12 @@ android { } dependencies { - compile fileTree(include: ['*.jar'], dir: 'libs') - androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', { + implementation fileTree(include: ['*.jar'], dir: 'libs') + androidTestCompile('androidx.test.espresso:espresso-core:3.1.0', { exclude group: 'com.android.support', module: 'support-annotations' }) - compile 'com.android.support:appcompat-v7:26.+' - testCompile 'junit:junit:4.12' + implementation 'androidx.appcompat:appcompat:1.2.0' + testImplementation 'junit:junit:4.13.1' compile files('libs/isoparser-1.0.6.jar') compile files('libs/aspectjrt-1.7.3.jar') } diff --git a/videocompressor/src/androidTest/java/com/vincent/videocompressor/ExampleInstrumentedTest.java b/videocompressor/src/androidTest/java/com/vincent/videocompressor/ExampleInstrumentedTest.java index 9af0edf..b8eb3ad 100644 --- a/videocompressor/src/androidTest/java/com/vincent/videocompressor/ExampleInstrumentedTest.java +++ b/videocompressor/src/androidTest/java/com/vincent/videocompressor/ExampleInstrumentedTest.java @@ -1,8 +1,8 @@ package com.vincent.videocompressor; import android.content.Context; -import android.support.test.InstrumentationRegistry; -import android.support.test.runner.AndroidJUnit4; +import androidx.test.platform.app.InstrumentationRegistry; +import androidx.test.ext.junit.runners.AndroidJUnit4; import org.junit.Test; import org.junit.runner.RunWith;