commit 2d7d536c6109028d9c3fc876afab84e54a78bae7
parent 3624c8a94baa0fae29e2f362d1c78521017309c5
Author: Taco <SkytkRSfan3895@gmail.com>
Date: Sat, 2 Feb 2019 16:35:40 -0500
migrate to androidx
Signed-off-by: Taco <SkytkRSfan3895@gmail.com>
Diffstat:
12 files changed, 34 insertions(+), 26 deletions(-)
diff --git a/app/build.gradle b/app/build.gradle
@@ -11,7 +11,7 @@ android {
versionCode 20
versionName "2.9"
- testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+ testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
buildTypes {
@@ -38,8 +38,10 @@ android {
dependencies {
// Support libraries
- implementation 'com.android.support:support-v4:28.0.0'
- implementation 'com.android.support:appcompat-v7:28.0.0'
+ implementation 'androidx.annotation:annotation:1.1.0-alpha01'
+ implementation 'androidx.appcompat:appcompat:1.1.0-alpha01'
+ implementation 'androidx.core:core:1.1.0-alpha04'
+ implementation 'androidx.fragment:fragment:1.1.0-alpha03'
// Other
implementation 'com.jaredrummler:material-spinner:1.3.1'
@@ -50,6 +52,6 @@ dependencies {
testImplementation 'org.hamcrest:hamcrest:2.1'
testImplementation 'org.powermock:powermock-api-mockito2:2.0.0'
testImplementation 'org.powermock:powermock-module-junit4:2.0.0'
- androidTestImplementation 'com.android.support.test:rules:1.0.2'
- androidTestImplementation 'com.android.support.test:runner:1.0.2'
+ androidTestImplementation 'androidx.test:rules:1.1.2-alpha01'
+ androidTestImplementation 'androidx.test:runner:1.1.2-alpha01'
}
diff --git a/app/src/androidTest/java/com/github/cythara/TunerViewTest.java b/app/src/androidTest/java/com/github/cythara/TunerViewTest.java
@@ -5,9 +5,6 @@ import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.graphics.Canvas;
import android.os.Environment;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.rule.GrantPermissionRule;
-import android.support.test.runner.AndroidJUnit4;
import org.junit.Assert;
import org.junit.Rule;
@@ -21,7 +18,11 @@ import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
-import static android.support.test.rule.GrantPermissionRule.grant;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.rule.GrantPermissionRule;
+import androidx.test.runner.AndroidJUnit4;
+
+import static androidx.test.rule.GrantPermissionRule.grant;
import static com.github.cythara.tuning.GuitarTuning.Pitch.*;
import static java.lang.String.format;
diff --git a/app/src/main/java/com/github/cythara/CanvasPainter.java b/app/src/main/java/com/github/cythara/CanvasPainter.java
@@ -8,12 +8,13 @@ import android.graphics.Matrix;
import android.graphics.Paint;
import android.graphics.Path;
import android.graphics.drawable.Drawable;
-import android.support.v4.content.ContextCompat;
import android.text.TextPaint;
import java.util.Locale;
import java.util.Objects;
+import androidx.core.content.ContextCompat;
+
import static android.graphics.Paint.ANTI_ALIAS_FLAG;
class CanvasPainter {
diff --git a/app/src/main/java/com/github/cythara/ListenerFragment.java b/app/src/main/java/com/github/cythara/ListenerFragment.java
@@ -5,11 +5,11 @@ import android.content.Context;
import android.os.AsyncTask;
import android.os.Build;
import android.os.Bundle;
-import android.support.v4.app.Fragment;
import java.util.ArrayList;
import java.util.List;
+import androidx.fragment.app.Fragment;
import be.tarsos.dsp.AudioDispatcher;
import be.tarsos.dsp.io.android.AudioDispatcherFactory;
import be.tarsos.dsp.pitch.PitchDetectionHandler;
diff --git a/app/src/main/java/com/github/cythara/MainActivity.java b/app/src/main/java/com/github/cythara/MainActivity.java
@@ -7,15 +7,6 @@ import android.content.pm.PackageManager;
import android.net.Uri;
import android.os.Build;
import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.content.ContextCompat;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.app.AlertDialog.Builder;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.app.AppCompatDelegate;
-import android.support.v7.widget.Toolbar;
import android.view.ContextThemeWrapper;
import android.view.Menu;
import android.view.MenuItem;
@@ -30,6 +21,16 @@ import com.shawnlin.numberpicker.NumberPicker.OnValueChangeListener;
import java.util.Arrays;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.app.AlertDialog.Builder;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatDelegate;
+import androidx.appcompat.widget.Toolbar;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
+import androidx.fragment.app.FragmentManager;
+
public class MainActivity extends AppCompatActivity implements TaskCallbacks,
OnItemSelectedListener, OnValueChangeListener {
diff --git a/app/src/main/java/com/github/cythara/NumberPickerDialog.java b/app/src/main/java/com/github/cythara/NumberPickerDialog.java
@@ -3,12 +3,13 @@ package com.github.cythara;
import android.app.Dialog;
import android.app.DialogFragment;
import android.os.Bundle;
-import android.support.v4.app.FragmentManager;
-import android.support.v7.app.AlertDialog.Builder;
import android.view.ContextThemeWrapper;
import com.shawnlin.numberpicker.NumberPicker;
+import androidx.appcompat.app.AlertDialog.Builder;
+import androidx.fragment.app.FragmentManager;
+
public class NumberPickerDialog extends DialogFragment {
private NumberPicker.OnValueChangeListener valueChangeListener;
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -7,7 +7,7 @@
android:orientation="vertical"
tools:context="com.github.cythara.MainActivity">
- <android.support.v7.widget.Toolbar
+ <androidx.appcompat.widget.Toolbar
android:id="@+id/my_toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
diff --git 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.jar b/gradle/wrapper/gradle-wrapper.jar
Binary files differ.
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.2-rc-1-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
@@ -28,7 +28,7 @@ APP_NAME="Gradle"
APP_BASE_NAME=`basename "$0"`
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+DEFAULT_JVM_OPTS='"-Xmx64m"'
# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum"
diff --git a/gradlew.bat b/gradlew.bat
@@ -14,7 +14,7 @@ set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
+set DEFAULT_JVM_OPTS="-Xmx64m"
@rem Find java.exe
if defined JAVA_HOME goto findJavaFromJavaHome
