Build enhancements + lint fixes

Author: pierrelevy

build.gradle

@@ -23,6 +23,11 @@ android {
 
     buildToolsVersion "19.1.0"
 
+    lintOptions {
+        enable 'UnusedIds', 'EasterEgg' //, 'NewerVersionAvailable'
+    }
+
+    apply from: 'sign.gradle'
 }
 
 

releases/androidsoft-puzzle-1.3.2.apk

@@ -0,0 +1,49 @@
+final Console console = System.console();
+
+if (console != null) {
+
+    android.signingConfigs {
+        release {
+            project.ext.keyStorePath = System.getenv("ANDROID_KEYSTORE")
+            if( project.keyStorePath != null )
+            {
+                storeFile file( keyStorePath )
+                keyAlias System.getenv("ANDROID_KEY_ALIAS")
+            }
+            storePassword "password"
+            keyPassword "password"
+        }
+    }
+    
+    task askForPasswords << {
+        // Must create String because System.readPassword() returns char[]
+        // (and assigning that below fails silently)
+        def storePw = new String(System.console().readPassword("\nKeystore password: "))
+        def keyPw  = new String(System.console().readPassword("Key password: "))
+
+        android.signingConfigs.release.storePassword = storePw
+        android.signingConfigs.release.keyPassword = keyPw
+    }
+
+    tasks.whenTaskAdded { theTask -> 
+        if (theTask.name.equals("packageRelease")) {
+            theTask.dependsOn "askForPasswords"
+        }
+    }
+    
+    android.buildTypes {
+        release {
+            signingConfig android.signingConfigs.release
+        }
+    }
+} else {
+
+    // Building from IDE's "Run" button
+    android.signingConfigs {
+        release {
+
+        }
+    }
+
+}
+

sign.gradle

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          android:versionCode="3"
-          android:versionName="1.2"
+          android:versionCode="6"
+          android:versionName="1.3.2"
 
      package="org.androidsoft.games.puzzle.kids">
     <uses-sdk android:minSdkVersion="4" android:targetSdkVersion="19"/>

src/main/AndroidManifest.xml

@@ -15,12 +15,11 @@
                    android:layout_height="wrap_content"
                    android:contentDescription="@string/image_splash"
                    android:gravity="center" />
-        <TextView android:id="@+id/text"
-                  android:layout_width="fill_parent"
+        <TextView android:layout_width="fill_parent"
                   android:layout_height="wrap_content"
                   android:gravity="center_horizontal|center_vertical"
                   android:layout_marginBottom="10dp"
-                  android:text="@+string/version" />
+                  android:text="@string/version" />
         <Button android:id="@+id/button_play"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"

src/main/res/layout-land/main.xml

@@ -15,11 +15,11 @@
                    android:layout_width="fill_parent"
                    android:layout_height="wrap_content"
                    android:gravity="center" />
-        <TextView android:id="@+id/text"
-                  android:layout_width="fill_parent"
+        <TextView android:layout_width="fill_parent"
                   android:layout_height="wrap_content"
                   android:gravity="center_horizontal|center_vertical"
-                  android:layout_marginBottom="10dp" />
+                  android:layout_marginBottom="10dp"
+                  android:text="@string/version" />
         <Button android:id="@+id/button_play"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"

src/main/res/layout/main.xml

@@ -2,6 +2,7 @@
 <resources>
     <string name="app_name">"Puzzle"</string>
     <string name="activity_title">"Cheer Bear Puzzle"</string>
+    <string name="version">"Version 1.3.2"</string>
     <string name="success">"Congratulations, That's done !"</string>
     <string name="new_game">"New game"</string>
     <string name="quit">"Quit"</string>
@@ -20,7 +21,7 @@
 
     <string name="credits_menu">About</string>
     <string name="credits_app_name">Cheer Bear Puzzle</string>
-    <string name="credits_current_version">Version 1.2.0</string>
+    <string name="credits_current_version">Version 1.3.2</string>
 
     <string name="image_splash">Splash screen logo</string>
     <string name="image_other_logo">Other logo</string>