plectrum

commit 28711b948df68e2942174c2932025505cfd7cabf
parent ba61264bf4ae9a7deb465d4f514a5693280d1b16
Author: TacoTheDank <SkytkRSfan3895@gmail.com>
Date:   Sun, 14 Jun 2020 16:26:28 -0400

Update Studio and dependencies

Diffstat:
M
.travis.yml
 | 
8
+++++---
M
app/build.gradle
 | 
25
+++++++++++--------------
M
app/src/androidTest/java/com/github/cythara/TunerViewTest.java
 | 
15
+++++++--------
M
build.gradle
 | 
2
+-

4 files changed, 24 insertions(+), 26 deletions(-)
diff --git a/.travis.yml b/.travis.yml
@@ -7,7 +7,7 @@ android:
     - tools
     - platform-tools
     - tools
-    - build-tools-28.0.3
+    - build-tools-29.0.3
     - android-28
     - extra-android-support
 
@@ -18,8 +18,10 @@ android:
 
 before_install:
   - mkdir "$ANDROID_HOME/licenses" || true
-  - echo -e "8933bad161af4178b1185d1a37fbf41ea5269c55\nd56f5187479451eabf01fb78af6dfcb131a6481e" > "$ANDROID_HOME/licenses/android-sdk-license"
-  - echo -e "\n84831b9409646a918e30573bab4c9c91346d8abd" > "$ANDROID_HOME/licenses/android-sdk-preview-license"
+  - echo -e "\n24333f8a63b6825ea9c5514f83c2829b004d1fee" >
+  "$ANDROID_HOME/licenses/android-sdk-license"
+  - echo -e "\n84831b9409646a918e30573bab4c9c91346d8abd" >
+  "$ANDROID_HOME/licenses/android-sdk-preview-license"
 
 script: ./gradlew build
 
diff --git a/app/build.gradle b/app/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 28
-    buildToolsVersion '28.0.3'
+    buildToolsVersion "29.0.3"
 
     defaultConfig {
         applicationId "com.github.cythara"
@@ -11,9 +11,9 @@ android {
         versionCode 24
         versionName "3.3"
 
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-
         vectorDrawables.useSupportLibrary = true
+
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
     buildTypes {
@@ -40,20 +40,17 @@ android {
 
 dependencies {
     // Support libraries
-    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'
+    implementation 'androidx.appcompat:appcompat:1.1.0'
 
     // Other
     implementation 'com.jaredrummler:material-spinner:1.3.1'
-    implementation 'com.shawnlin:number-picker:2.4.7'
+    implementation 'com.shawnlin:number-picker:2.4.10'
 
     // Testing libraries
-    testImplementation 'junit:junit:4.13-beta-1'
-    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 'androidx.test:rules:1.1.2-alpha01'
-    androidTestImplementation 'androidx.test:runner:1.1.2-alpha01'
+    testImplementation 'junit:junit:4.13'
+    testImplementation 'org.hamcrest:hamcrest:2.2'
+    testImplementation 'org.powermock:powermock-api-mockito2:2.0.7'
+    testImplementation 'org.powermock:powermock-module-junit4:2.0.7'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
+    androidTestImplementation 'androidx.test:rules:1.2.0'
 }
diff --git a/app/src/androidTest/java/com/github/cythara/TunerViewTest.java b/app/src/androidTest/java/com/github/cythara/TunerViewTest.java
@@ -6,6 +6,10 @@ import android.graphics.BitmapFactory;
 import android.graphics.Canvas;
 import android.os.Environment;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.rule.GrantPermissionRule;
+
 import org.junit.Assert;
 import org.junit.Rule;
 import org.junit.Test;
@@ -18,11 +22,6 @@ import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
 
-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;
 
@@ -35,15 +34,15 @@ public class TunerViewTest {
 
     @Rule
     public GrantPermissionRule recordAudioRule =
-            grant(Manifest.permission.RECORD_AUDIO);
+            GrantPermissionRule.grant(Manifest.permission.RECORD_AUDIO);
 
     @Rule
     public GrantPermissionRule writePermissionRule =
-            grant(Manifest.permission.WRITE_EXTERNAL_STORAGE);
+            GrantPermissionRule.grant(Manifest.permission.WRITE_EXTERNAL_STORAGE);
 
     @Rule
     public GrantPermissionRule readPermissionRule =
-            grant(Manifest.permission.READ_EXTERNAL_STORAGE);
+            GrantPermissionRule.grant(Manifest.permission.READ_EXTERNAL_STORAGE);
 
     @Test
     public void exactly_matching_pitch_is_displayed() throws IOException {
diff --git a/build.gradle b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.2'
+        classpath 'com.android.tools.build:gradle:4.0.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files