Gradle updates

1595Dragons · Feb 28, 2019 · 6d5dded · 6d5dded
1 parent 1f76232
commit 6d5dded
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 12 deletions.
diff --git a/AndroidApp/app/build.gradle b/AndroidApp/app/build.gradle
@@ -7,9 +7,8 @@ android {
         applicationId "org.dragons.Dragons.scoutingapp"
         minSdkVersion 19
         targetSdkVersion 28
-        versionCode 4
-        versionName '1.2'
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        versionCode 5
+        versionName '2.0'
     }
     buildTypes {
         release {
@@ -27,10 +26,5 @@ android {
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
-        exclude group: 'com.android.support', module: 'support-annotations'
-    })
     implementation 'com.android.support:appcompat-v7:28.0.0'
-    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
-    testImplementation 'junit:junit:4.12'
 }
diff --git a/AndroidApp/app/src/main/java/org/frc1595Dragons/scoutingapp/Activities/data_collection.java b/AndroidApp/app/src/main/java/org/frc1595Dragons/scoutingapp/Activities/data_collection.java
@@ -8,6 +8,7 @@
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.*;
+
 import org.frc1595Dragons.scoutingapp.BlueFiles.Bluetooth;
 import org.frc1595Dragons.scoutingapp.BlueFiles.Request;
 import org.frc1595Dragons.scoutingapp.MatchFiles.Match;

diff --git a/AndroidApp/app/src/main/java/org/frc1595Dragons/scoutingapp/Activities/main_activity.java b/AndroidApp/app/src/main/java/org/frc1595Dragons/scoutingapp/Activities/main_activity.java
@@ -7,6 +7,7 @@
 import android.view.View;
 import android.widget.EditText;
 import android.widget.Toast;
+
 import org.frc1595Dragons.scoutingapp.BlueFiles.Bluetooth;
 import org.frc1595Dragons.scoutingapp.R;
 

diff --git a/AndroidApp/app/src/main/java/org/frc1595Dragons/scoutingapp/BlueFiles/Bluetooth.java b/AndroidApp/app/src/main/java/org/frc1595Dragons/scoutingapp/BlueFiles/Bluetooth.java
@@ -93,7 +93,11 @@ public static boolean isBluetoothOn() {
 			// If its null, one cause is that its just turned off, so try re-enabling it
 			// Prompt user to turn on Bluetooth
 			AppCompatActivity activity = new AppCompatActivity();
-			activity.startActivityForResult(turnOnBluetooth, 1);
+			try {
+				activity.startActivityForResult(turnOnBluetooth, 1);
+			} catch (NullPointerException NPE) {
+				return false;
+			}
 			isOn = btAdapter.isEnabled();
 		}
 

diff --git a/AndroidApp/build.gradle b/AndroidApp/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.1'
+        classpath 'com.android.tools.build:gradle:3.3.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

diff --git a/AndroidApp/gradle/wrapper/gradle-wrapper.properties b/AndroidApp/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Apr 02 14:53:13 PDT 2018
+#Wed Feb 27 11:59:35 PST 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip