From 3151cb14f33bcf54a6a72a37e0c8514ed3d0cd98 Mon Sep 17 00:00:00 2001 From: HappyZ Date: Wed, 13 Dec 2017 16:32:44 -0600 Subject: [PATCH] upgrade to Android 3.0.1 --- OffloadingDemo/.idea/misc.xml | 3 -- OffloadingDemo/build.gradle | 10 +++- OffloadingDemo/mobile/build.gradle | 13 +++-- OffloadingDemo/mobile/mobile.iml | 79 ++++++++++++++++++------------ OffloadingDemo/wear/build.gradle | 4 +- OffloadingDemo/wear/wear.iml | 37 ++++++++++---- 6 files changed, 96 insertions(+), 50 deletions(-) diff --git a/OffloadingDemo/.idea/misc.xml b/OffloadingDemo/.idea/misc.xml index 4a0c9c4..75dac50 100755 --- a/OffloadingDemo/.idea/misc.xml +++ b/OffloadingDemo/.idea/misc.xml @@ -1,8 +1,5 @@ - - - - + + - + - + @@ -48,6 +49,13 @@ + + + + + + + @@ -80,7 +88,9 @@ + + @@ -90,47 +100,54 @@ + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/OffloadingDemo/wear/build.gradle b/OffloadingDemo/wear/build.gradle index ae37433..b90b949 100755 --- a/OffloadingDemo/wear/build.gradle +++ b/OffloadingDemo/wear/build.gradle @@ -3,7 +3,7 @@ apply plugin: 'com.android.application' android { compileSdkVersion 23 - buildToolsVersion '25.0.0' + buildToolsVersion '26.0.2' defaultConfig { applicationId "edu.ucsb.cs.sandlab.offloadingdemo" @@ -21,7 +21,7 @@ android { } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) + compile fileTree(include: ['*.jar'], dir: 'libs') compile 'com.google.android.support:wearable:1.3.0' compile 'com.google.android.gms:play-services-wearable:7.8.0' } diff --git a/OffloadingDemo/wear/wear.iml b/OffloadingDemo/wear/wear.iml index 4d33ece..6441800 100644 --- a/OffloadingDemo/wear/wear.iml +++ b/OffloadingDemo/wear/wear.iml @@ -27,20 +27,21 @@ + - + - + @@ -55,6 +56,13 @@ + + + + + + + @@ -77,22 +85,33 @@ + + + + + + + + + + + + - - - - - - - + + + + + + \ No newline at end of file