bumped to 0.9.10

crankycoder · crankycoder · commit 421fa9cdcf40 · 2015-06-24T17:24:01.000-07:00
diff --git a/android/build.gradle b/android/build.gradle
@@ -89,8 +89,8 @@ dependencies {
     testCompile project(':libraries:fxa')
 
     // Uncomment this for release builds
-    // compile 'org.mozilla.accounts.fxa:fxa:0.9.9'
-    // testCompile 'org.mozilla.accounts.fxa:fxa:0.9.9'
+    // compile 'org.mozilla.accounts.fxa:fxa:0.9.10'
+    // testCompile 'org.mozilla.accounts.fxa:fxa:0.9.10'
 
     // https://developer.android.com/tools/support-library/features.html
     // In general, we recommend including the v4 support and v7 appcompat
diff --git a/android/src/main/java/org/mozilla/firefoxaccounts/MainApp.java b/android/src/main/java/org/mozilla/firefoxaccounts/MainApp.java
@@ -13,6 +13,11 @@
 
 import org.mozilla.accounts.fxa.FxAGlobals;
 import org.mozilla.accounts.fxa.dialog.DevOAuthDialog;
+
+
+// These tasks are hardcoded to point to our dev servers.
+// You probably want to look at org.mozilla.accounts.fxa.tasks
+// for the regular tasks that can be repointed to any FxA server.
 import org.mozilla.accounts.fxa.tasks.dev.DevDestroyOAuthTask;
 import org.mozilla.accounts.fxa.tasks.dev.DevRetrieveProfileTask;
 import org.mozilla.accounts.fxa.tasks.dev.DevSetDisplayNameTask;
diff --git a/libraries/fxa/Makefile b/libraries/fxa/Makefile
@@ -1,6 +1,10 @@
 all:
 	./gradlew build
 
+# This installs the build into the local maven repository
+install:
+	./gradlew install
+
 test:
 	./gradlew test
 
diff --git a/libraries/fxa/build.gradle b/libraries/fxa/build.gradle
@@ -1,7 +1,7 @@
 // each of the version numbers must be 0-99
 def versionMajor = 0 
 def versionMinor = 9 // minor feature releases
-def versionPatch = 9 // This should be bumped for hot fixes
+def versionPatch = 10 // This should be bumped for hot fixes
 
 // Double check the versioning
 for (versionPart in [versionPatch, versionMinor, versionMajor]) {
diff --git a/libraries/fxa/src/main/java/org/mozilla/accounts/fxa/tasks/dev/DevDestroyOAuthTask.java b/libraries/fxa/src/main/java/org/mozilla/accounts/fxa/tasks/dev/DevDestroyOAuthTask.java
@@ -10,8 +10,6 @@
 import static org.mozilla.accounts.fxa.tasks.dev.DevConstants.STABLE_DEV_OAUTH2_SERVER;
 
 public class DevDestroyOAuthTask extends DestroyOAuthTask {
-
-
     public DevDestroyOAuthTask(Context ctx) {
         super(ctx, STABLE_DEV_OAUTH2_SERVER);
     }

Original file line number	Diff line number	Diff line change
`@@ -10,8 +10,6 @@`
`10`	`10`	`import static org.mozilla.accounts.fxa.tasks.dev.DevConstants.STABLE_DEV_OAUTH2_SERVER;`
`11`	`11`
`12`	`12`	`public class DevDestroyOAuthTask extends DestroyOAuthTask {`
`13`		`-`
`14`		`-`
`15`	`13`	`public DevDestroyOAuthTask(Context ctx) {`
`16`	`14`	`super(ctx, STABLE_DEV_OAUTH2_SERVER);`
`17`	`15`	`}`