aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArne Schwabe <arne@rfc2549.org>2014-06-09 22:51:02 +0200
committerArne Schwabe <arne@rfc2549.org>2014-06-09 23:00:18 +0200
commit1f6359f235547b7b1cefe7abed7dccc34812e922 (patch)
tree7cc73edfb1d283ecd925d4f7ec1599edca522a44
parentcf1f8ec8123361922a9cf3cf083de37097acf77f (diff)
downloadcgeo-1f6359f235547b7b1cefe7abed7dccc34812e922.zip
cgeo-1f6359f235547b7b1cefe7abed7dccc34812e922.tar.gz
cgeo-1f6359f235547b7b1cefe7abed7dccc34812e922.tar.bz2
Fix bulding with gradle/Android studio.
Update rx java to 0.19 Also add unfinished prototypes for the seldom used side projects.
-rw-r--r--build.gradle2
-rw-r--r--cgeo-calendar/build.gradle29
-rw-r--r--cgeo-contacts/build.gradle31
-rw-r--r--gradle/wrapper/gradle-wrapper.properties4
-rw-r--r--main/build.gradle4
-rw-r--r--settings.gradle9
6 files changed, 69 insertions, 10 deletions
diff --git a/build.gradle b/build.gradle
index 93e9c85..e55d892 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
mavenCentral()
}
dependencies {
- classpath 'com.android.tools.build:gradle:0.10.+'
+ classpath 'com.android.tools.build:gradle:0.11.+'
// the latest version of the android-apt plugin
classpath 'com.neenbedankt.gradle.plugins:android-apt:1.1'
//gradle-properties
diff --git a/cgeo-calendar/build.gradle b/cgeo-calendar/build.gradle
new file mode 100644
index 0000000..8a65860
--- /dev/null
+++ b/cgeo-calendar/build.gradle
@@ -0,0 +1,29 @@
+apply plugin: 'android'
+
+android {
+ compileSdkVersion 19
+ buildToolsVersion "19.1.0"
+
+
+
+ defaultConfig {
+ minSdkVersion 9
+ targetSdkVersion 19
+ versionName "1.2"
+ versionCode 3
+ }
+
+ sourceSets {
+ main {
+ manifest.srcFile 'AndroidManifest.xml'
+ java.srcDirs = ['src']
+ res.srcDirs = ['res']
+ assets.srcDirs = ['assets']
+ }
+ }
+}
+
+dependencies {
+ // The dependency to the ICalnder interface from the main project is missing
+ // compile project(":main") is not working
+} \ No newline at end of file
diff --git a/cgeo-contacts/build.gradle b/cgeo-contacts/build.gradle
new file mode 100644
index 0000000..f4f3693
--- /dev/null
+++ b/cgeo-contacts/build.gradle
@@ -0,0 +1,31 @@
+apply plugin: 'android'
+
+android {
+ compileSdkVersion 19
+ buildToolsVersion "19.1.0"
+
+
+
+ defaultConfig {
+ minSdkVersion 9
+ targetSdkVersion 19
+ versionName "1.1"
+ versionCode 2
+ }
+
+ sourceSets {
+ main {
+ manifest.srcFile 'AndroidManifest.xml'
+ java.srcDirs = ['src']
+ res.srcDirs = ['res']
+ assets.srcDirs = ['assets']
+ }
+ }
+}
+
+dependencies {
+ compile 'org.apache.commons:commons-lang3:3.3.2'
+ compile files('../main/compile-libs/org.eclipse.jdt.annotation_1.1.0.v20130513-1648.jar')
+ // The depency to the ICalnder interface from the main project is missing
+ // compile(:main) is not right
+} \ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 5de946b..68320f5 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Apr 10 15:27:10 PDT 2013
+#Mon Jun 09 21:59:47 CEST 2014
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-all.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-all.zip
diff --git a/main/build.gradle b/main/build.gradle
index 42aaf4b..ae8877b 100644
--- a/main/build.gradle
+++ b/main/build.gradle
@@ -27,7 +27,7 @@ gradle connectedCheck
//https://github.com/stephanenicolas/Quality-Tools-for-Android
def AAVersion = '3.0.1'
-def RXVersion = '0.18.3'
+def RXVersion = '0.19.0'
group = 'cgeo.geocaching'
version = '0.0.1'
@@ -54,7 +54,7 @@ android {
versionCode versionProps['code'].toInteger()
// NOTE: must match the package in the test directory and must be different from the app package
- testPackageName "cgeo.geocaching.test"
+ testApplicationId "cgeo.geocaching.test"
// standard android test runner
//testInstrumentationRunner "android.test.InstrumentationTestRunner"
diff --git a/settings.gradle b/settings.gradle
index 1ae9410..9108f7f 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,6 +1,5 @@
+include ':mapswithme-api'
include ':main'
-//include ':send2cgeo'
-include ':cgeo-calendar'
-include ':cgeo-contacts'
-//include ':settings'
-include ':mapswithme-api' \ No newline at end of file
+//include ':cgeo-calendar'
+//include ':cgeo-contacts'
+