the usual tons of androidstudio upgrades

geopaparazzi · May 12, 2018 · 711bfde · 711bfde
1 parent cf41cf0
commit 711bfde
Show file tree

Hide file tree

Showing 10 changed files with 35 additions and 8 deletions.
diff --git a/build.gradle b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.1'
+        classpath 'com.android.tools.build:gradle:3.1.2'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -20,8 +20,8 @@ allprojects {
     }
     project.ext {
         myApplicationId = "eu.hydrologis.geopaparazzi"
-        myVersionCode = 89
-        myVersionName = "5.5.5"
+        myVersionCode = 90
+        myVersionName = "5.5.6"
 
         mycompileSdkVersion = 27
         mybuildToolsVersion = "28.0.0-rc1"

diff --git a/geopaparazzi_acrylicpaint/build.gradle b/geopaparazzi_acrylicpaint/build.gradle
@@ -20,6 +20,10 @@ android {
     lintOptions {
         abortOnError false
     }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_7
+        targetCompatibility JavaVersion.VERSION_1_7
+    }
 }
 
 dependencies {

diff --git a/geopaparazzilibrary/build.gradle b/geopaparazzilibrary/build.gradle
@@ -37,8 +37,8 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_1_7
+        targetCompatibility JavaVersion.VERSION_1_7
     }
     productFlavors {
     }
@@ -57,7 +57,6 @@ dependencies {
     compile 'com.android.support:support-v4:27.1.0'
     compile 'ch.acra:acra:4.9.0'
     compile 'com.androidplot:androidplot-core:0.6.1'
-
     compile 'com.android.support:multidex:1.0.3'
 }
 

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Thu Nov 16 16:00:16 CET 2017
+#Sat May 12 08:38:26 CEST 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
diff --git a/plugins/geopaparazzi_default_export_plugins/build.gradle b/plugins/geopaparazzi_default_export_plugins/build.gradle
@@ -20,6 +20,10 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_7
+        targetCompatibility JavaVersion.VERSION_1_7
+    }
 }
 
 dependencies {

diff --git a/plugins/geopaparazzi_default_import_plugins/build.gradle b/plugins/geopaparazzi_default_import_plugins/build.gradle
@@ -20,6 +20,10 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_7
+        targetCompatibility JavaVersion.VERSION_1_7
+    }
 }
 
 dependencies {

diff --git a/plugins/geopaparazzi_pdf_export_plugins/build.gradle b/plugins/geopaparazzi_pdf_export_plugins/build.gradle
@@ -17,6 +17,10 @@ android {
             //proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_7
+        targetCompatibility JavaVersion.VERSION_1_7
+    }
 }
 
 dependencies {

diff --git a/plugins/geopaparazzi_profiles_import_plugins/build.gradle b/plugins/geopaparazzi_profiles_import_plugins/build.gradle
@@ -17,6 +17,10 @@ android {
             //proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_7
+        targetCompatibility JavaVersion.VERSION_1_7
+    }
 }
 
 dependencies {

diff --git a/plugins/geopaparazzi_projects_export_plugins/build.gradle b/plugins/geopaparazzi_projects_export_plugins/build.gradle
@@ -17,6 +17,10 @@ android {
             //proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_7
+        targetCompatibility JavaVersion.VERSION_1_7
+    }
 }
 
 dependencies {

diff --git a/plugins/geopaparazzi_projects_import_plugins/build.gradle b/plugins/geopaparazzi_projects_import_plugins/build.gradle
@@ -20,6 +20,10 @@ android {
     dexOptions {
         preDexLibraries = false
     }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_7
+        targetCompatibility JavaVersion.VERSION_1_7
+    }
 }
 
 dependencies {