diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 647ba27..090ee54 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -3,6 +3,9 @@ \ No newline at end of file diff --git a/androidlame/androidlame.iml b/androidlame/androidlame.iml index 292bf92..417075e 100644 --- a/androidlame/androidlame.iml +++ b/androidlame/androidlame.iml @@ -8,7 +8,7 @@ - @@ -22,34 +22,33 @@ - - + + - - + - + - - - + - + + @@ -81,14 +80,6 @@ - - - - - - - - @@ -97,41 +88,76 @@ - - - - - + + + + + + + + + + + + + + + + + - - - - + + + + + + + + + + - - + + - + - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/androidlame/build.gradle b/androidlame/build.gradle index 4f425a5..8378c9e 100644 --- a/androidlame/build.gradle +++ b/androidlame/build.gradle @@ -2,12 +2,11 @@ apply plugin: 'com.android.library' apply plugin: 'com.github.dcendents.android-maven' android { - compileSdkVersion 26 - buildToolsVersion "26.0.2" + compileSdkVersion 28 defaultConfig { minSdkVersion 16 - targetSdkVersion 26 + targetSdkVersion 28 versionCode 1 versionName "1.0" } @@ -29,6 +28,6 @@ android { dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) - compile 'com.android.support:appcompat-v7:26.1.0' + implementation fileTree(dir: 'libs', include: ['*.jar']) + implementation 'androidx.appcompat:appcompat:1.0.2' } diff --git a/app/build.gradle b/app/build.gradle index 53a3afe..96a2a52 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -2,13 +2,12 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 26 - buildToolsVersion "26.0.2" + compileSdkVersion 28 defaultConfig { applicationId "com.naman14.tandroidlame" minSdkVersion 16 - targetSdkVersion 26 + targetSdkVersion 28 versionCode 1 versionName "1.0" } @@ -29,9 +28,9 @@ android { dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) - compile 'com.android.support:appcompat-v7:26.1.0' - compile 'com.android.support:recyclerview-v7:26.1.0' - compile project(':androidlame') + implementation fileTree(dir: 'libs', include: ['*.jar']) + implementation 'androidx.appcompat:appcompat:1.0.2' + implementation 'androidx.recyclerview:recyclerview:1.0.0' + implementation project(':androidlame') } diff --git a/app/src/main/java/com/naman14/tandroidlame/EncodeActivity.java b/app/src/main/java/com/naman14/tandroidlame/EncodeActivity.java index dd96d45..20e1b3b 100644 --- a/app/src/main/java/com/naman14/tandroidlame/EncodeActivity.java +++ b/app/src/main/java/com/naman14/tandroidlame/EncodeActivity.java @@ -20,12 +20,13 @@ import android.os.Bundle; import android.os.Environment; import android.provider.MediaStore; -import android.support.annotation.Nullable; -import android.support.v7.app.AppCompatActivity; import android.view.View; import android.widget.Button; import android.widget.TextView; +import androidx.annotation.Nullable; +import androidx.appcompat.app.AppCompatActivity; + import com.naman14.androidlame.AndroidLame; import com.naman14.androidlame.LameBuilder; import com.naman14.androidlame.WaveReader; diff --git a/app/src/main/java/com/naman14/tandroidlame/LogFragment.java b/app/src/main/java/com/naman14/tandroidlame/LogFragment.java index 873aaf3..10738dd 100644 --- a/app/src/main/java/com/naman14/tandroidlame/LogFragment.java +++ b/app/src/main/java/com/naman14/tandroidlame/LogFragment.java @@ -15,15 +15,16 @@ package com.naman14.tandroidlame; import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.TextView; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/naman14/tandroidlame/MainActivity.java b/app/src/main/java/com/naman14/tandroidlame/MainActivity.java index b3e9b21..93f59d8 100644 --- a/app/src/main/java/com/naman14/tandroidlame/MainActivity.java +++ b/app/src/main/java/com/naman14/tandroidlame/MainActivity.java @@ -5,14 +5,15 @@ import android.content.pm.PackageManager; import android.net.Uri; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.app.ActivityCompat; -import android.support.v4.content.ContextCompat; -import android.support.v7.app.AppCompatActivity; import android.view.View; import android.widget.Button; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.appcompat.app.AppCompatActivity; +import androidx.core.app.ActivityCompat; +import androidx.core.content.ContextCompat; + public class MainActivity extends AppCompatActivity { diff --git a/app/src/main/java/com/naman14/tandroidlame/Mp3AudioRecordActivity.java b/app/src/main/java/com/naman14/tandroidlame/Mp3AudioRecordActivity.java index 5f1eea1..38a579a 100644 --- a/app/src/main/java/com/naman14/tandroidlame/Mp3AudioRecordActivity.java +++ b/app/src/main/java/com/naman14/tandroidlame/Mp3AudioRecordActivity.java @@ -19,13 +19,14 @@ import android.media.MediaRecorder; import android.os.Bundle; import android.os.Environment; -import android.support.annotation.Nullable; -import android.support.v7.app.AppCompatActivity; import android.view.View; import android.widget.Button; import android.widget.TextView; import android.widget.Toast; +import androidx.annotation.Nullable; +import androidx.appcompat.app.AppCompatActivity; + import com.naman14.androidlame.AndroidLame; import com.naman14.androidlame.LameBuilder; diff --git a/build.gradle b/build.gradle index 6b0e4f3..dd19b5f 100644 --- a/build.gradle +++ b/build.gradle @@ -8,7 +8,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.0.0' + classpath 'com.android.tools.build:gradle:3.4.0' classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5' //necessary for jitpack.io with android studio 3 // NOTE: Do not place your application dependencies here; they belong diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index c3dd323..f33d4f2 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Nov 01 22:00:58 CET 2017 +#Wed May 01 16:03:04 CEST 2019 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip