Gradle: clean and copies apk files into www/apps folder

.gitignore

@@ -1,30 +1,31 @@
-/target
-build.log
-reporting.log
-.metadata
-*.class
-*.swp
-*~
-manifest.txt
-java/com.sap.sailing.gwt.ui/gwt-unitCache/*
-java/com.sap.sailing.gwt.ui/war/WEB-INF/deploy/*
-java/com.sap.sse.security.ui/WEB-INF/deploy/*
-sailing_debug0*
-dist
-build
-/java/.settings/org.eclipse.jdt.core.prefs
-/java/com.sap.sailing.server.gateway.serialization.test/.settings/*.prefs
-.DS_Store
-java/com.sap.sailing.simulator/bin/com/sap/sailing/simulator/Simulator.gwt.xml
-/mobile/com.sap.sailing.racecommittee.app/res/values/keys.xml
-java/com.sap.sailing.gwt.ui/SailingGWT Remote Profiling (Run-Mode only).launch
-java/com.sap.sailing.gwt.ui/SailingGWT.launch
-
-## Android Studio and Intellij and Android in general
-gen/
-.idea/
-*.ipr
-*.iws
-*.iml
-out/
-.gradle
+/target
+build.log
+reporting.log
+.metadata
+*.class
+*.swp
+*~
+manifest.txt
+java/com.sap.sailing.gwt.ui/gwt-unitCache/*
+java/com.sap.sailing.gwt.ui/war/WEB-INF/deploy/*
+java/com.sap.sse.security.ui/WEB-INF/deploy/*
+sailing_debug0*
+dist
+build
+/java/.settings/org.eclipse.jdt.core.prefs
+/java/com.sap.sailing.server.gateway.serialization.test/.settings/*.prefs
+.DS_Store
+java/com.sap.sailing.simulator/bin/com/sap/sailing/simulator/Simulator.gwt.xml
+/mobile/com.sap.sailing.racecommittee.app/res/values/keys.xml
+java/com.sap.sailing.gwt.ui/SailingGWT Remote Profiling (Run-Mode only).launch
+java/com.sap.sailing.gwt.ui/SailingGWT.launch
+
+## Android Studio and Intellij and Android in general
+gen/
+.idea/
+*.ipr
+*.iws
+*.iml
+out/
+.gradle
+local.properties

mobile/com.sap.sailing.android.shared/build.gradle

@@ -1,8 +1,5 @@
 apply plugin: 'com.android.library'
 
-sourceCompatibility = 1.7
-targetCompatibility = 1.7
-
 android {
     buildToolsVersion "21.1.2"
     compileSdkVersion 21

mobile/com.sap.sailing.android.tracking.app/build.gradle

@@ -1,8 +1,5 @@
 apply plugin: "com.android.application"
 
-sourceCompatibility = 1.7
-targetCompatibility = 1.7
-
 def packageName = "com.sap.sailing.android.tracking.app"
 def verCode = 1
 
@@ -15,7 +12,8 @@ android {
         minSdkVersion 14
         targetSdkVersion 21
         versionCode verCode
-        versionName "1 - Altitude"
+        versionName "$verCode - Altitude"
+        useJack false
     }
 
     sourceSets {
@@ -72,24 +70,26 @@ dependencies {
 // Custom tasks
 
 /**
- * Deletes apk and xml from www apps directory
+ * Deletes apk and version from www apps directory
  */
 clean.doLast {
-//    delete(fileTree(dir: "../../java/com.sap.sailing.www/apps", includes: "com.sap.sailing.android.tracking.*.*"))
+    ant.delete() {
+        fileset(dir: file("../../java/com.sap.sailing.www/apps"), includes: "$packageName*")
+    }
 }
 
 /**
- * Copies apk into www apps directory and create xml file
+ * Copies apk into www apps directory and create version file
  */
 build.doLast {
-//    // Copy APK file
-//    copy {
-//        from ("build/outputs/apk") {
-//            include "**/*release*.apk"
-//        }
-//        into "../../java/com.sap.sailing.wwww/apps"
-//        rename { String fileName -> fileName.replace("-release-unsigned", "") }
-//    }
+    // Copy APK file
+    copy {
+        from ("build/outputs/apk") {
+            include "**/*release-unsigned.apk"
+        }
+        into "../../java/com.sap.sailing.www/apps"
+        rename { String fileName -> fileName.replace("-release-unsigned", "") }
+    }
 //
 //    // Create version file
 //    xmlFile = file("$wwwFolder/$packageName.version")

mobile/com.sap.sailing.racecommittee.app/build.gradle

@@ -1,18 +1,19 @@
 apply plugin: "com.android.application"
 
-sourceCompatibility = 1.7
-targetCompatibility = 1.7
+def packageName = "com.sap.sailing.racecommittee.app"
+def verCode = 6
 
 android {
     buildToolsVersion "21.1.2"
     compileSdkVersion 21
 
     defaultConfig {
-        applicationId "com.sap.sailing.racecommittee.app"
+        applicationId packageName
         minSdkVersion 13
         targetSdkVersion 21
-        versionCode 6
-        versionName "6 - Laser"
+        versionCode verCode
+        versionName "$verCode - Laser"
+        useJack false
     }
 
     sourceSets {
@@ -20,6 +21,7 @@ android {
             manifest.srcFile "AndroidManifest.xml"
             java.srcDirs = ["src"]
             res.srcDirs = ["res"]
+            assets.srcDirs = ['assets']
         }
     }
 
@@ -65,3 +67,30 @@ dependencies {
     compile fileTree(dir: "libs", include: ["*.jar"])
 }
 
+// Custom tasks
+
+/**
+ * Deletes apk and version from www apps directory
+ */
+clean.doLast {
+    ant.delete() {
+        fileset(dir: file("../../java/com.sap.sailing.www/apps"), includes: "$packageName*")
+    }
+}
+
+/**
+ * Copies apk into www apps directory and create version file
+ */
+build.doLast {
+    // Copy APK file
+    copy {
+        from ("build/outputs/apk") {
+            include "**/*release-unsigned.apk"
+        }
+        into "../../java/com.sap.sailing.www/apps"
+        rename { String fileName -> fileName.replace("-release-unsigned", "") }
+    }
+//
+//    // Create version file
+//    xmlFile = file("$wwwFolder/$packageName.version")
+}

mobile/pom.xml

@@ -13,10 +13,12 @@
     <packaging>pom</packaging>
 
     <modules>
+<!--
         <module>com.sap.sailing.racecommittee.app</module>
         <module>com.sap.sailing.android.shared</module>
         <module>com.sap.sailing.android.tracking.app</module>
         <module>google-volley_lib</module>
+-->
     </modules>
 
     <properties>