Merge pull request #623 from zumbrunnen/gradle_cleanup

arthurbenemann · arthurbenemann · commit 664776779a02 · 2014-02-12T13:28:55.000-02:00
Gradle Cleanup
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,5 @@
 .idea/*
+*.iml
 local.properties
 gradle
 .gradle
diff --git a/DroidPlanner/FlightDataActivity.iml b/DroidPlanner/FlightDataActivity.iml
diff --git a/DroidPlanner/build.gradle b/DroidPlanner/build.gradle
@@ -2,7 +2,8 @@ apply plugin: 'android'
 
 dependencies {
     compile files('libs/usbseriallibrary.jar')
-    compile project(':google-play-services_lib')
+    compile 'com.android.support:support-v4:18.0.0'
+    compile 'com.google.android.gms:play-services:4.0.30'
     compile project(':Mavlink')
     compile project(':HorizontalVariableListView:HorizontalVariableListView')
 }
diff --git a/HorizontalVariableListView b/HorizontalVariableListView
@@ -1 +1 @@
-Subproject commit 02db1e397087ad9f218be0c10ca8fed37af97267
+Subproject commit 5f99a665426f391ba175f34c4d528bfec36519ff
diff --git a/Mavlink/Mavlink.iml b/Mavlink/Mavlink.iml
diff --git a/Mavlink/build.gradle b/Mavlink/build.gradle
@@ -1,7 +1,7 @@
 apply plugin: 'android-library'
 
 dependencies {
-    compile project(':google-play-services_lib')
+    compile 'com.android.support:support-v4:18.0.0'
 }
 
 android {
diff --git a/Mavlink/project.properties b/Mavlink/project.properties
@@ -11,6 +11,6 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-18
+target=android-19
 android.library=true
-android.library.reference.1=../google-play-services_lib
+
diff --git a/build.gradle b/build.gradle
@@ -1,9 +1,16 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
+
 buildscript {
     repositories {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.7.+'
+        classpath 'com.android.tools.build:gradle:0.8.+'
     }
 }
+
+allprojects {
+    repositories {
+        mavenCentral()
+    }
+}
diff --git a/droidplanner.iml b/droidplanner.iml
diff --git a/google-play-services_lib/build.gradle b/google-play-services_lib/build.gradle
@@ -2,14 +2,11 @@ buildscript {
     repositories {
         mavenCentral()
     }
-    dependencies {
-        classpath 'com.android.tools.build:gradle:0.7.+'
-    }
 }
 apply plugin: 'android-library'
 
 dependencies {
-    compile 'com.android.support:support-v4:13.0.0'
+    compile 'com.android.support:support-v4:18.0.0'
     compile 'com.google.android.gms:play-services:4.0.30'
 }
 
diff --git a/google-play-services_lib/google-play-services_lib.iml b/google-play-services_lib/google-play-services_lib.iml
diff --git a/google-play-services_lib/project.properties b/google-play-services_lib/project.properties
@@ -11,5 +11,5 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-18
+target=android-19
 android.library=true
diff --git a/settings.gradle b/settings.gradle
@@ -1,5 +1,3 @@
-include ':google-play-services_lib'
 include ':Mavlink'
 include ':HorizontalVariableListView:HorizontalVariableListView'
-include ':usb-serial-for-android:UsbSerialLibrary'
 include ':DroidPlanner'
diff --git a/usb-serial-for-android b/usb-serial-for-android
@@ -1 +1 @@
-Subproject commit 7cdbcee291e1264d3d8d6a5fe57fed4bc264777d
+Subproject commit 38a2a0165a729d669d7d1fe036fba65bf4b6c422

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`.idea/*`
	`2`	`+*.iml`
`2`	`3`	`local.properties`
`3`	`4`	`gradle`
`4`	`5`	`.gradle`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,8 @@ apply plugin: 'android'`
`2`	`2`
`3`	`3`	`dependencies {`
`4`	`4`	`compile files('libs/usbseriallibrary.jar')`
`5`		`- compile project(':google-play-services_lib')`
	`5`	`+ compile 'com.android.support:support-v4:18.0.0'`
	`6`	`+ compile 'com.google.android.gms:play-services:4.0.30'`
`6`	`7`	`compile project(':Mavlink')`
`7`	`8`	`compile project(':HorizontalVariableListView:HorizontalVariableListView')`
`8`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`apply plugin: 'android-library'`
`2`	`2`
`3`	`3`	`dependencies {`
`4`		`- compile project(':google-play-services_lib')`
	`4`	`+ compile 'com.android.support:support-v4:18.0.0'`
`5`	`5`	`}`
`6`	`6`
`7`	`7`	`android {`
Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,16 @@`
`1`	`1`	`// Top-level build file where you can add configuration options common to all sub-projects/modules.`
	`2`	`+`
`2`	`3`	`buildscript {`
`3`	`4`	`repositories {`
`4`	`5`	`mavenCentral()`
`5`	`6`	`}`
`6`	`7`	`dependencies {`
`7`		`- classpath 'com.android.tools.build:gradle:0.7.+'`
	`8`	`+ classpath 'com.android.tools.build:gradle:0.8.+'`
`8`	`9`	`}`
`9`	`10`	`}`
	`11`	`+`
	`12`	`+allprojects {`
	`13`	`+ repositories {`
	`14`	`+ mavenCentral()`
	`15`	`+ }`
	`16`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -2,14 +2,11 @@ buildscript {`
`2`	`2`	`repositories {`
`3`	`3`	`mavenCentral()`
`4`	`4`	`}`
`5`		`- dependencies {`
`6`		`- classpath 'com.android.tools.build:gradle:0.7.+'`
`7`		`- }`
`8`	`5`	`}`
`9`	`6`	`apply plugin: 'android-library'`
`10`	`7`
`11`	`8`	`dependencies {`
`12`		`- compile 'com.android.support:support-v4:13.0.0'`
	`9`	`+ compile 'com.android.support:support-v4:18.0.0'`
`13`	`10`	`compile 'com.google.android.gms:play-services:4.0.30'`
`14`	`11`	`}`
`15`	`12`