minor build tweaks to be paranoid during a release build

bumped version to 0.42.0.0

Author: crankycoder

Makefile

@@ -2,7 +2,7 @@ test: unittest
 	./gradlew testUnittest --info
 
 release_check:
-	. ./release_check.sh
+	./release_check.py
 
 unittest:
 	./gradlew assembleUnittest

VERSION

@@ -1 +1 @@
-0.41.0.2
+0.42.0.0

android/build.gradle

@@ -1,8 +1,8 @@
 // each of the version numbers must be 0-99
 def versionMajor = 0
-def versionMinor = 41
+def versionMinor = 42
 def versionPatch = 0
-def versionBuild = 2 // this is non-zero for any dev build
+def versionBuild = 0 // this is non-zero for any dev build
 
 buildscript {
     repositories {

android/proguard.cfg

@@ -52,3 +52,11 @@
 }
 
 -libraryjars <java.home>/lib/rt.jar(java/**,javax/**)
+
+# osmdroid introduced these dumb warnings
+-dontwarn org.apache.**
+
+# proguard has started to die on optimisation because of our merged osmdroid code
+-dontoptimize
+
+-mergeinterfacesaggressively

android/src/main/AndroidManifest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.mozilla.mozstumbler"
-    android:versionCode="410002"
-    android:versionName="0.41.0.2" >
+    android:versionCode="420000"
+    android:versionName="0.42.0.0" >
 
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />

release_check.py

@@ -0,0 +1,13 @@
+#!/usr/bin/env python
+
+props = {}
+for line in open('private.properties'):
+    if len(line.strip()) == 0:
+        continue
+    k, v = line.strip().split('=')
+    props[k] = v
+assert 'MapAPIKey' in props, 'MapAPIKey is ok'
+assert 'MozAPIKey' in props, 'MozAPIKey is ok'
+assert 'ACRA_URI' in props, 'ACRA_URI is ok'
+assert 'ACRA_USER' in props, 'ACRA_USER is ok'
+assert 'ACRA_PASS' in props, 'ACRA_PASS is ok'