From 91f02190f80240a4c7293661f50240a6cec77a5a Mon Sep 17 00:00:00 2001 From: rtrimana Date: Tue, 16 Jan 2018 10:07:16 -0800 Subject: [PATCH] Updating gradle for SpeakerLocator app --- .../PhoneInterface/SpeakerLocator/app/build.gradle | 2 +- .../example/xub3/speakerlocator/MainActivity.java | 11 +++++------ .../app/src/main/res/values/strings.xml | 6 +++--- .../other/PhoneInterface/SpeakerLocator/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 12 ++++++------ 5 files changed, 16 insertions(+), 17 deletions(-) diff --git a/benchmarks/other/PhoneInterface/SpeakerLocator/app/build.gradle b/benchmarks/other/PhoneInterface/SpeakerLocator/app/build.gradle index 3d9830a..d56e243 100644 --- a/benchmarks/other/PhoneInterface/SpeakerLocator/app/build.gradle +++ b/benchmarks/other/PhoneInterface/SpeakerLocator/app/build.gradle @@ -2,7 +2,7 @@ apply plugin: 'com.android.application' android { compileSdkVersion 23 - buildToolsVersion "23.0.3" + buildToolsVersion '25.0.0' useLibrary 'org.apache.http.legacy' defaultConfig { applicationId "com.example.xub3.speakerlocator" diff --git a/benchmarks/other/PhoneInterface/SpeakerLocator/app/src/main/java/com/example/xub3/speakerlocator/MainActivity.java b/benchmarks/other/PhoneInterface/SpeakerLocator/app/src/main/java/com/example/xub3/speakerlocator/MainActivity.java index 87af3e0..a8b6b92 100644 --- a/benchmarks/other/PhoneInterface/SpeakerLocator/app/src/main/java/com/example/xub3/speakerlocator/MainActivity.java +++ b/benchmarks/other/PhoneInterface/SpeakerLocator/app/src/main/java/com/example/xub3/speakerlocator/MainActivity.java @@ -23,7 +23,6 @@ import com.google.android.gms.appindexing.AppIndex; import com.google.android.gms.common.api.GoogleApiClient; import java.io.File; -import java.io.IOException; import java.util.ArrayList; import java.util.List; @@ -68,9 +67,9 @@ public class MainActivity extends AppCompatActivity implements PositionListener initializePositioning(); FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab); tv = (TextView) findViewById(R.id.hellotext); - if (helper.httpclient == null) { - helper.setConnection(getApplicationContext().getResources().getString(R.string.gateway_ip)); - } +// if (helper.httpclient == null) { +// helper.setConnection(getApplicationContext().getResources().getString(R.string.gateway_ip)); +// } fab.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { @@ -121,8 +120,8 @@ public class MainActivity extends AppCompatActivity implements PositionListener File file = new File(Environment.getExternalStorageDirectory(), "positioningPersistence.xml"); try { positionManager = new PositionManager(file); - Log.d("positionManager", "initialized"); - System.out.println("PositionManager: Initialized successfully!"); + //Log.d("positionManager", "initialized"); + //System.out.println("PositionManager: Initialized successfully!"); } catch (PositioningPersistenceException e) { e.printStackTrace(); } diff --git a/benchmarks/other/PhoneInterface/SpeakerLocator/app/src/main/res/values/strings.xml b/benchmarks/other/PhoneInterface/SpeakerLocator/app/src/main/res/values/strings.xml index 6e357b5..c87cf7f 100644 --- a/benchmarks/other/PhoneInterface/SpeakerLocator/app/src/main/res/values/strings.xml +++ b/benchmarks/other/PhoneInterface/SpeakerLocator/app/src/main/res/values/strings.xml @@ -1,9 +1,9 @@ SpeakerLocator Settings - 192.168.2.191 - 74:da:38:68:72:84 - 00:24:98:9a:92:ee + 192.168.0.84 + b0:b9:8a:73:69:f4 + b0:b9:8a:73:69:f3 00:24:98:9a:92:ef 00:24:98:98:8a:51 00:24:98:98:8a:50 diff --git a/benchmarks/other/PhoneInterface/SpeakerLocator/build.gradle b/benchmarks/other/PhoneInterface/SpeakerLocator/build.gradle index 74b2ab0..c2eea8e 100644 --- a/benchmarks/other/PhoneInterface/SpeakerLocator/build.gradle +++ b/benchmarks/other/PhoneInterface/SpeakerLocator/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.2.3' + classpath 'com.android.tools.build:gradle:2.3.3' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/benchmarks/other/PhoneInterface/SpeakerLocator/gradle/wrapper/gradle-wrapper.properties b/benchmarks/other/PhoneInterface/SpeakerLocator/gradle/wrapper/gradle-wrapper.properties index b963a84..1dd327c 100644 --- a/benchmarks/other/PhoneInterface/SpeakerLocator/gradle/wrapper/gradle-wrapper.properties +++ b/benchmarks/other/PhoneInterface/SpeakerLocator/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Feb 20 08:45:44 PST 2017 -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 +#Tue Jan 16 09:33:57 PST 2018 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip -- 2.34.1