JDK 8 support for Android platform.

gradle/.idea/misc.xml

@@ -1,9 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="FrameworkDetectionExcludesConfiguration">
+    <type id="jpa" />
+    <type id="web" />
+  </component>
   <component name="MavenProjectsManager">
     <option name="originalFiles">
       <list>
         <option value="$PROJECT_DIR$/../../opal/pom.xml" />
+        <option value="$PROJECT_DIR$/../../pom.xml" />
       </list>
     </option>
   </component>

gradle/build.gradle

@@ -4,11 +4,11 @@ allprojects {
     group = 'com.lyndir.masterpassword'
     version = 'GIT-SNAPSHOT'
 
-    tasks.withType(JavaCompile) {
+    tasks.withType( JavaCompile ) {
         sourceCompatibility = '1.8'
         targetCompatibility = '1.8'
     }
-    tasks.withType(FindBugs) {
+    tasks.withType( FindBugs ) {
         reports {
             xml.enabled false
             html.enabled true
@@ -18,16 +18,19 @@ allprojects {
 
 buildscript {
     repositories {
+        google()
         jcenter()
     }
 
     dependencies {
-        classpath group: 'com.android.tools.build', name: 'gradle', version: '2.3.2'
+        classpath group: 'com.android.tools.build', name: 'gradle', version: '3.1.0'
     }
 }
 
 subprojects {
     repositories {
+        google()
+        jcenter()
         mavenCentral()
         maven { url 'http://maven.lyndir.com' }
     }

gradle/settings.gradle

@@ -19,12 +19,11 @@ include 'masterpassword-tests'
 project(':masterpassword-tests').projectDir = new File( '../platform-independent/java/tests' )
 
 include 'masterpassword-gui'
-project(':masterpassword-gui').projectDir = new File( '../platform-independent/gui-java' )
+project(':masterpassword-gui').projectDir = new File( '../platform-independent/java/gui' )
 
-/*
 if (local.containsKey('sdk.dir')) {
     include 'masterpassword-android'
     project(':masterpassword-android').projectDir = new File( '../platform-android' )
 } else {
     logger.warn( "Skipping masterpassword-android since sdk.dir is not defined in local.properties." )
-}*/
+}