aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBananeweizen <bananeweizen@gmx.de>2014-11-15 18:50:06 +0100
committerBananeweizen <bananeweizen@gmx.de>2014-11-15 18:50:06 +0100
commit9decc41160abe5efa1c6c0f0c240ef507afe3a1a (patch)
tree3152001e27fb1dcbc176e4ac6f7e14e4cf820fc1
parentb7039537efa15b9f0a24221cf6b017088a7affcd (diff)
downloadcgeo-9decc41160abe5efa1c6c0f0c240ef507afe3a1a.zip
cgeo-9decc41160abe5efa1c6c0f0c240ef507afe3a1a.tar.gz
cgeo-9decc41160abe5efa1c6c0f0c240ef507afe3a1a.tar.bz2
upgrade to AndroidAnnotations 3.2
-rw-r--r--main/.factorypath2
-rw-r--r--main/build.gradle4
-rw-r--r--main/compile-libs/androidannotations-3.2.jar (renamed from main/compile-libs/androidannotations-3.1.jar)bin676320 -> 701151 bytes
-rw-r--r--main/libs/androidannotations-api-3.1.jar.properties1
-rw-r--r--main/libs/androidannotations-api-3.2.jar (renamed from main/libs/androidannotations-api-3.1.jar)bin106438 -> 112164 bytes
-rw-r--r--main/libs/androidannotations-api-3.2.jar.properties1
-rw-r--r--main/libs/src/androidannotations-api-3.2-sources.jar (renamed from main/libs/src/androidannotations-api-3.1-sources.jar)bin156487 -> 160807 bytes
7 files changed, 4 insertions, 4 deletions
diff --git a/main/.factorypath b/main/.factorypath
index 31dafcb..16ea046 100644
--- a/main/.factorypath
+++ b/main/.factorypath
@@ -1,4 +1,4 @@
<factorypath>
<factorypathentry kind="WKSPJAR" id="/cgeo/libs/butterknife-6.0.0.jar" enabled="true" runInBatchMode="false"/>
- <factorypathentry kind="WKSPJAR" id="/cgeo/compile-libs/androidannotations-3.1.jar" enabled="true" runInBatchMode="false"/>
+ <factorypathentry kind="WKSPJAR" id="/cgeo/compile-libs/androidannotations-3.2.jar" enabled="true" runInBatchMode="false"/>
</factorypath>
diff --git a/main/build.gradle b/main/build.gradle
index f1a8281..ce5cb76 100644
--- a/main/build.gradle
+++ b/main/build.gradle
@@ -26,7 +26,7 @@ gradle connectedCheck
//Testing guide : http://tools.android.com/tech-docs/new-build-system/user-guide#TOC-Testing
//https://github.com/stephanenicolas/Quality-Tools-for-Android
-def AAVersion = '3.1'
+def AAVersion = '3.2'
def RXVersion = '0.20.6'
def JacksonCoreVersion = '2.4.3'
def JacksonDatabindVersion = '2.4.3'
@@ -170,7 +170,7 @@ dependencies {
compile "com.fasterxml.jackson.core:jackson-annotations:$JacksonAnnotationsVersion"
//TEST
- //compile files('compile-libs/androidannotations-3.0.1.jar')
+ //compile files('compile-libs/androidannotations-3.2.jar')
//compile files('compile-libs/findbugs-ant.jar')
//compile files('compile-libs/findbugs-jsr305.jar') //CheckForNull conflict with com.google.code.findbugs:annotations
compile files('compile-libs/org.eclipse.jdt.annotation_1.1.0.v20130513-1648.jar')
diff --git a/main/compile-libs/androidannotations-3.1.jar b/main/compile-libs/androidannotations-3.2.jar
index a053b7e..9f40472 100644
--- a/main/compile-libs/androidannotations-3.1.jar
+++ b/main/compile-libs/androidannotations-3.2.jar
Binary files differ
diff --git a/main/libs/androidannotations-api-3.1.jar.properties b/main/libs/androidannotations-api-3.1.jar.properties
deleted file mode 100644
index c0d53eb..0000000
--- a/main/libs/androidannotations-api-3.1.jar.properties
+++ /dev/null
@@ -1 +0,0 @@
-src=src/androidannotations-api-3.1-sources.jar \ No newline at end of file
diff --git a/main/libs/androidannotations-api-3.1.jar b/main/libs/androidannotations-api-3.2.jar
index 7a7bdf6..12d4ef0 100644
--- a/main/libs/androidannotations-api-3.1.jar
+++ b/main/libs/androidannotations-api-3.2.jar
Binary files differ
diff --git a/main/libs/androidannotations-api-3.2.jar.properties b/main/libs/androidannotations-api-3.2.jar.properties
new file mode 100644
index 0000000..ff6ac8c
--- /dev/null
+++ b/main/libs/androidannotations-api-3.2.jar.properties
@@ -0,0 +1 @@
+src=src/androidannotations-api-3.2-sources.jar \ No newline at end of file
diff --git a/main/libs/src/androidannotations-api-3.1-sources.jar b/main/libs/src/androidannotations-api-3.2-sources.jar
index 339756a..acc6ba9 100644
--- a/main/libs/src/androidannotations-api-3.1-sources.jar
+++ b/main/libs/src/androidannotations-api-3.2-sources.jar
Binary files differ