From 30616baae39c4cd60405f6ac97e66bbc6191c365 Mon Sep 17 00:00:00 2001 From: goujicheng Date: Tue, 10 Sep 2019 16:57:58 +0800 Subject: [PATCH] Update gradle version and merge AndroidX --- app/build.gradle | 9 ++++----- .../androidaudiorecorder/example/MainActivity.java | 4 ++-- .../adriel/androidaudiorecorder/example/Util.java | 4 ++-- build.gradle | 5 ++++- gradle.properties | 2 ++ gradle/wrapper/gradle-wrapper.properties | 2 +- lib/build.gradle | 11 +++++------ .../androidaudiorecorder/AndroidAudioRecorder.java | 2 +- .../androidaudiorecorder/AudioRecorderActivity.java | 4 ++-- 9 files changed, 23 insertions(+), 20 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 024db50..1889800 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,12 +1,11 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 24 - buildToolsVersion "24.0.2" + compileSdkVersion 29 defaultConfig { applicationId "cafe.adriel.androidaudiorecorder.example" minSdkVersion 15 - targetSdkVersion 24 + targetSdkVersion 29 versionCode 1 versionName "1.0" } @@ -19,8 +18,8 @@ android { } dependencies { - compile 'com.android.support:appcompat-v7:24.2.1' - compile project(':lib') + implementation 'androidx.appcompat:appcompat:1.1.0' + implementation project(':lib') // compile 'com.github.adrielcafe:AndroidAudioRecorder:0.1.0' } diff --git a/app/src/main/java/cafe/adriel/androidaudiorecorder/example/MainActivity.java b/app/src/main/java/cafe/adriel/androidaudiorecorder/example/MainActivity.java index 177baa1..f7767ea 100644 --- a/app/src/main/java/cafe/adriel/androidaudiorecorder/example/MainActivity.java +++ b/app/src/main/java/cafe/adriel/androidaudiorecorder/example/MainActivity.java @@ -5,8 +5,8 @@ import android.graphics.drawable.ColorDrawable; import android.os.Bundle; import android.os.Environment; -import android.support.v4.content.ContextCompat; -import android.support.v7.app.AppCompatActivity; +import androidx.core.content.ContextCompat; +import androidx.appcompat.app.AppCompatActivity; import android.view.View; import android.widget.Toast; diff --git a/app/src/main/java/cafe/adriel/androidaudiorecorder/example/Util.java b/app/src/main/java/cafe/adriel/androidaudiorecorder/example/Util.java index a2b0c82..c89b3cd 100644 --- a/app/src/main/java/cafe/adriel/androidaudiorecorder/example/Util.java +++ b/app/src/main/java/cafe/adriel/androidaudiorecorder/example/Util.java @@ -2,8 +2,8 @@ import android.app.Activity; import android.content.pm.PackageManager; -import android.support.v4.app.ActivityCompat; -import android.support.v4.content.ContextCompat; +import androidx.core.app.ActivityCompat; +import androidx.core.content.ContextCompat; public class Util { diff --git a/build.gradle b/build.gradle index ccb76fa..bf7827c 100644 --- a/build.gradle +++ b/build.gradle @@ -1,15 +1,18 @@ buildscript { repositories { jcenter() + google() } dependencies { - classpath 'com.android.tools.build:gradle:2.2.0' + classpath 'com.android.tools.build:gradle:3.5.0' } } allprojects { repositories { jcenter() + google() + } } diff --git a/gradle.properties b/gradle.properties index aac7c9b..9e6fce1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,6 +9,8 @@ # Specifies the JVM arguments used for the daemon process. # The setting is particularly useful for tweaking memory settings. +android.enableJetifier=true +android.useAndroidX=true org.gradle.jvmargs=-Xmx1536m # When configured, Gradle will run in incubating parallel mode. diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 2fac210..81921dc 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-2.14.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip diff --git a/lib/build.gradle b/lib/build.gradle index 2a9c22c..10edf6d 100644 --- a/lib/build.gradle +++ b/lib/build.gradle @@ -1,12 +1,11 @@ apply plugin: 'com.android.library' android { - compileSdkVersion 24 - buildToolsVersion "24.0.2" + compileSdkVersion 29 defaultConfig { minSdkVersion 15 - targetSdkVersion 24 + targetSdkVersion 29 versionCode 1 versionName "1.0" } @@ -19,7 +18,7 @@ android { } dependencies { - compile 'com.android.support:appcompat-v7:24.2.1' - compile 'com.kailashdabhi:om-recorder:1.1.0' - compile 'com.cleveroad:audiovisualization:1.0.0' + implementation 'androidx.appcompat:appcompat:1.1.0' + implementation 'com.kailashdabhi:om-recorder:1.1.0' + implementation 'com.cleveroad:audiovisualization:1.0.0' } \ No newline at end of file diff --git a/lib/src/main/java/cafe/adriel/androidaudiorecorder/AndroidAudioRecorder.java b/lib/src/main/java/cafe/adriel/androidaudiorecorder/AndroidAudioRecorder.java index 27c6375..38b337d 100644 --- a/lib/src/main/java/cafe/adriel/androidaudiorecorder/AndroidAudioRecorder.java +++ b/lib/src/main/java/cafe/adriel/androidaudiorecorder/AndroidAudioRecorder.java @@ -4,7 +4,7 @@ import android.content.Intent; import android.graphics.Color; import android.os.Environment; -import android.support.v4.app.Fragment; +import androidx.fragment.app.Fragment; import cafe.adriel.androidaudiorecorder.model.AudioChannel; import cafe.adriel.androidaudiorecorder.model.AudioSampleRate; diff --git a/lib/src/main/java/cafe/adriel/androidaudiorecorder/AudioRecorderActivity.java b/lib/src/main/java/cafe/adriel/androidaudiorecorder/AudioRecorderActivity.java index e5a7d9a..384b3f5 100644 --- a/lib/src/main/java/cafe/adriel/androidaudiorecorder/AudioRecorderActivity.java +++ b/lib/src/main/java/cafe/adriel/androidaudiorecorder/AudioRecorderActivity.java @@ -5,8 +5,8 @@ import android.graphics.drawable.ColorDrawable; import android.media.MediaPlayer; import android.os.Bundle; -import android.support.v4.content.ContextCompat; -import android.support.v7.app.AppCompatActivity; +import androidx.core.content.ContextCompat; +import androidx.appcompat.app.AppCompatActivity; import android.view.Menu; import android.view.MenuItem; import android.view.View;