Merge pull request #221 from cpeterso/v0.7.5

MozStumbler v0.7.5

.travis.yml

@@ -2,10 +2,10 @@ language: java
 jdk: oraclejdk7
 
 before_install:
-    - ANDROID_API_LEVEL=18
-    - ANDROID_SDK_TOOLS_VERSION=22.2.1
-    - ANDROID_BUILD_TOOLS_VERSION=18.1
-    - ANDROID_OS_VERSION=4.3
+    - ANDROID_API_LEVEL=19
+    - ANDROID_SDK_TOOLS_VERSION=22.3
+    - ANDROID_BUILD_TOOLS_VERSION=19
+    - ANDROID_OS_VERSION=4.4
     - GRADLE_VERSION=1.8
 
     # Install Android SDK

AndroidManifest.xml.in

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.mozilla.mozstumbler"
-    android:versionCode="15"
-    android:versionName="0.7.4" >
+    android:versionCode="16"
+    android:versionName="0.7.5" >
 
     <uses-sdk
         android:minSdkVersion="8"
-        android:targetSdkVersion="18" />
+        android:targetSdkVersion="19" />
 
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>

README.md

@@ -1,12 +1,14 @@
 MozStumbler
 [![Build Status](https://travis-ci.org/dougt/MozStumbler.png)](https://travis-ci.org/dougt/MozStumbler.png)
 
+# Building #
+
 ```
-gradlew build
-gradlew installRelease
+./gradlew build
+./gradlew installRelease
 ```
 
-Signing
+# Signing #
 
 In order to sign the APK, you will want to create a 'gradle.properties' file.  The content should look like the following except it should contain your key signing
 information:
@@ -15,10 +17,19 @@ information:
 StoreFile=<path to file>
 StorePassword=<password>
 KeyAlias=<key alias>
-KeyPassword=<password>.
+KeyPassword=<password>
+GoogleAPIKey=<optional: your Google Maps API key>
+MozAPIKey=test
 ```
 
-To generate a key, search the internet for details.  This command is probably what you want:
+To obtain a free Google API key:
+
+1. Create an account on https://cloud.google.com/console.
+2. Browse to the APIs & auth > APIs menu.
+3. Enable the API name "Google Maps Android API v2". You do **not** need any of the other Google Maps API keys.
+4. *TODO: add instructions for registering your app certificate with Google's API console.**
+
+To generate a signing key, search the internet for details.  This command is probably what you want:
 
 ```
 keytool -genkey -v -keystore my-release-key.keystore -alias mozstumbler -keyalg RSA -keysize 2048 -validity 10000
@@ -30,3 +41,25 @@ To verify the apk has been signed, you can run this command:
 jarsigner -verify -verbose -certs build/apk/MozStumbler*
 ```
 
+# Releasing #
+
+This release process ought to be automated.
+
+1. `MOZSTUMBLER_VERSION=x.y.z`
+2. `git checkout -b v$MOZSTUMBLER_VERSION`
+2. `echo $MOZSTUMBLER_VERSION > VERSION`
+2. Increment `android:versionCode` and `android:versionName` in the AndroidManifest.xml.in file.
+3. `git commit -m "MozStumbler v$MOZSTUMBLER_VERSION" AndroidManifest.xml.in VERSION`
+4. Push the new version branch to GitHub and file a new pull requests so Travis can start building it.
+5. `./gradlew build`
+6. `mv build/apk/MozStumbler-release.apk build/apk/MozStumbler-$MOZSTUMBLER_VERSION.apk`
+7. Browse to https://github.com/dougt/MozStumbler/releases.
+8. "Draft a new release" with the release title "MozStumbler v$MOZSTUMBLER_VERSION" and tag version "v$MOZSTUMBLER_VERSION".
+9. Add some release notes and give @credit to contributors!
+10. Drag and drop the new MozStumbler-v$MOZSTUMBLER_VERSION.apk to the "Attach binaries for this release by dropping them here." box.
+11. Check "This is a pre-release" because perpetual beta.
+12. **Save draft**. Do *not* "Publish release" yet because master does not have the new VERSION file!
+13. Merge the new version pull request. **NB:** *There is a race condition between steps 13 and 14!* It is mostly harmless, but be quick about it.
+14. *Now* go back to the draft release and **Publish release**.
+15. Email a release announcment to the dev-geolocation mailing list with release notes giving @credit to contributors and a link to the release's page https://github.com/dougt/MozStumbler/releases/tag/v$MOZSTUMBLER_VERSION.
+16. Good work!

VERSION

@@ -1 +1 @@
-0.7.4
+0.7.5

build.gradle

@@ -16,8 +16,8 @@ dependencies {
 }
 
 android {
-    compileSdkVersion 18
-    buildToolsVersion '18.1'
+    compileSdkVersion 19
+    buildToolsVersion '19'
 
     sourceSets {
         main {