Update project structure to work with Android Studio 1.1.0.

README.mkd

@@ -3,8 +3,6 @@ OpenXC Android Library
 
 [![Build Status](https://travis-ci.org/openxc/openxc-android.svg?branch=master)](https://travis-ci.org/openxc/openxc-android)
 
-[![Coverage Status](https://coveralls.io/repos/openxc/openxc-android/badge.png?branch=master)](https://coveralls.io/r/openxc/openxc-android?branch=master)
-
 [![Stories in Ready](https://badge.waffle.io/openxc/openxc-android.png?label=ready&title=Ready)](http://waffle.io/openxc/openxc-android)
 
 This library is a part of the [OpenXC][] project.

build.gradle

@@ -0,0 +1,17 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+
+buildscript {
+    repositories {
+        jcenter()
+    }
+
+    dependencies {
+        classpath 'com.android.tools.build:gradle:1.2.3'
+    }
+}
+
+allprojects {
+    repositories {
+        jcenter()
+    }
+}

enabler/build.gradle

@@ -0,0 +1,40 @@
+apply plugin: 'com.android.application'
+
+android {
+    compileSdkVersion 22
+    buildToolsVersion "22.0.1"
+
+    defaultConfig {
+        applicationId "com.openxc.enabler"
+        minSdkVersion 10
+        targetSdkVersion 22
+        versionCode 6000007
+        versionName "6.0.7"
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
+        }
+    }
+
+    lintOptions {
+        abortOnError false
+    }
+}
+
+dependencies {
+    compile project(":library")
+
+    compile 'com.google.code.gson:gson:2.3'
+    compile 'com.google.guava:guava:18.0'
+    compile 'com.google.protobuf:protobuf-java:2.6.1'
+    compile 'commons-io:commons-io:2.4'
+    compile 'com.android.support:support-v4:19.1.0'
+    compile 'com.bugsnag:bugsnag-android:3.2.2'
+
+    androidTestCompile 'junit:junit:4.12'
+    androidTestCompile 'org.hamcrest:hamcrest-all:1.3'
+    androidTestCompile 'org.mockito:mockito-core:1.10.8'
+}

openxc-it/src/com/openxc/sources/trace/TraceVehicleDataSourceTest.java → enabler/src/androidTest/java/com/openxc/sources/trace/TraceVehicleDataSourceTest.java

@@ -14,7 +14,7 @@
 import com.openxc.sources.DataSourceException;
 import com.openxc.sources.SourceCallback;
 import com.openxc.sources.VehicleDataSource;
-import com.openxcplatform.instrumentationtests.R;
+import com.openxcplatform.R;
 
 public class TraceVehicleDataSourceTest extends AndroidTestCase {
     URI traceUri;

enabler/AndroidManifest.xml → enabler/src/main/AndroidManifest.xml

@@ -13,7 +13,7 @@
   <uses-feature android:name="android.hardware.usb.host" android:required="true"/>
   <uses-sdk android:minSdkVersion="10" android:targetSdkVersion="21"/>
 
-  <application android:allowBackup="true" android:debuggable="false" android:icon="@drawable/open_xc_launcher_icon_black" android:label="@string/app_name">
+  <application android:allowBackup="true" android:icon="@drawable/open_xc_launcher_icon_black" android:label="@string/app_name">
       <service android:name="com.openxc.enabler.preferences.PreferenceManagerService"/>
       <service android:name="com.openxc.VehicleManager"/>
       <service android:name="com.openxc.remote.VehicleService" android:process=":remote">
@@ -57,4 +57,4 @@
       <meta-data android:name="com.bugsnag.token" android:value="@string/bugsnag_token"/>
   </application>
 
-</manifest>
+</manifest>

enabler/src/com/openxc/enabler/preferences/FileRecordingPreferenceManager.java → enabler/src/main/java/com/openxc/enabler/preferences/FileRecordingPreferenceManager.java

@@ -52,12 +52,8 @@ private void setFileRecordingStatus(boolean enabled) {
                     mCurrentDirectory = directory;
                     stopRecording();
 
-                    try {
-                        mFileRecorder = new FileRecorderSink(
-                                new AndroidFileOpener(directory));
-                    } catch(DataSinkException e) {
-                        Log.w(TAG, "Unable to start trace recording", e);
-                    }
+                    mFileRecorder = new FileRecorderSink(
+                            new AndroidFileOpener(directory));
                     getVehicleManager().addSink(mFileRecorder);
                 }
             } else {

openxc/app/build.gradle → library/build.gradle

@@ -1,12 +1,12 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 21
-    buildToolsVersion "21.1.2"
+    compileSdkVersion 22
+    buildToolsVersion "22.0.1"
 
     defaultConfig {
         minSdkVersion 10
-        targetSdkVersion 21
+        targetSdkVersion 22
     }
 
     buildTypes {
@@ -21,8 +21,6 @@ android {
     }
 }
 
-apply plugin: 'android-unit-test'
-
 dependencies {
     compile 'com.google.code.gson:gson:2.3'
     compile 'com.google.guava:guava:18.0'
@@ -33,5 +31,6 @@ dependencies {
     testCompile 'junit:junit:4.12'
     testCompile 'org.hamcrest:hamcrest-all:1.3'
     testCompile 'org.mockito:mockito-core:1.10.8'
-    testCompile 'org.robolectric:robolectric:2.4'
+    testCompile 'org.robolectric:robolectric:3.0-rc3'
+    testCompile 'org.robolectric:shadows-httpclient:3.0-rc3'
 }

openxc/app/src/main/AndroidManifest.xml → library/src/main/AndroidManifest.xml

@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="6000007" android:versionName="6.0.7-SNAPSHOT" package="com.openxcplatform">
   <uses-permission android:name="android.permission.ACCESS_MOCK_LOCATION"/>
   <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
-    <application android:label="">
+    <application>
         <service android:name="com.openxc.VehicleManager"/>
         <service android:name="com.openxc.remote.VehicleService" android:process=":remote"/>
         <activity android:name="com.openxc.interfaces.usb.UsbDeviceAttachmentActivity"/>