Release preparations

Author: samtstern

.gitignore

@@ -12,3 +12,11 @@ target
 
 # Other
 /site/docs
+
+# Credentials / Releasing
+service-account.json
+release.properties
+*.xml.releaseBackup
+*.xml.tag
+*.xml.next
+

README.md

@@ -58,31 +58,56 @@ and [read our docs for more information about indexing your data](https://www.fi
 ## Including GeoFire in your project Android/Java
 
 In order to use GeoFire in your project, you need to [add the Firebase Android
-SDK](https://firebase.google.com/docs/android/setup). After that you can include
-GeoFire with one of the choices below.
+SDK](https://firebase.google.com/docs/android/setup). After that you can include GeoFire with one of the choices below.
+
+Note that after version `1.1.1` the artifact `com.firebase:geofire` is no
+longer updated and has been replaced by the separate Android and Java
+artifacts as described below.
 
 ### Gradle
 
-Add a dependency for GeoFire to your `gradle.build` file:
+Add a dependency for GeoFire to your `gradle.build` file.
+
+For Android applications:
 
 ```groovy
 dependencies {
-    compile 'com.firebase:geofire:2.0.0'
+    compile 'com.firebase:geofire-android:2.0.0'
 }
 ```
 
+For non-Android Java applications:
+
+```groovy
+dependencies {
+    compile 'com.firebase:geofire-java:2.0.0'
+}
+
+```
+
 ### Maven
 
-GeoFire also works with Maven:
+GeoFire also works with Maven.
+
+For Android applications:
 
 ```xml
 <dependency>
   <groupId>com.firebase</groupId>
-  <artifactId>geofire</artifactId>
+  <artifactId>geofire-android</artifactId>
   <version>2.0.0</version>
 </dependency>
 ```
 
+For non-Android Java applications:
+
+```xml
+<dependency>
+  <groupId>com.firebase</groupId>
+  <artifactId>geofire-java</artifactId>
+  <version>2.0.0</version>
+</dependency>
+```
 
 ### Jar-File
 
@@ -257,10 +282,11 @@ the query to the new visible map area after a user scrolls.
 
 
 ## Deployment
-- log onto the build box
-- checkout and update the master branch
-- `./release.sh` to build the client and update maven
-- close/release the repository from sonatype
+- In your local environment set `$BINTRAY_USER` and `$BINTRAY_KEY` to your
+  Bintray.com username and API key.
+- Checkout and update the master branch.
+- Run `./release.sh` to build and deploy.
+- On bintray.com, publish the draft artifacts.
 - Update [firebase-versions](https://github.com/firebase/firebase-clients/blob/master/versions/firebase-versions.json) with the changelog from this version
 - tweet the release
 

android/pom.xml

@@ -34,6 +34,14 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
+
+  <distributionManagement>
+    <repository>
+        <id>geofire</id>
+        <url>https://api.bintray.com/maven/firebase/geofire/geofire-android</url>
+    </repository>
+  </distributionManagement>
+
   <build>
     <sourceDirectory>../src/main/java</sourceDirectory>
     <plugins>
@@ -45,6 +53,7 @@
       </plugin>
     </plugins>
   </build>
+
   <repositories>
     <repository>
        <id>google-extras</id>

create-docs.sh

@@ -9,5 +9,6 @@ mvn javadoc:javadoc
 
 echo "Renaming output folder"
 rm -rf site/docs
+mkdir -p target/site/apidocs
 mv target/site/apidocs site/docs
 popd

java/pom.xml

@@ -34,9 +34,19 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
+
+  <distributionManagement>
+    <repository>
+        <id>geofire</id>
+        <url>https://api.bintray.com/maven/firebase/geofire/geofire-java</url>
+    </repository>
+  </distributionManagement>
+
   <build>
-    <!-- Plugins inherited -->
+    <sourceDirectory>../src/main/java</sourceDirectory>
+    <testSourceDirectory>../src/test/java</testSourceDirectory>
   </build>
+
   <dependencies>
     <dependency>
       <groupId>com.google.firebase</groupId>

pom.xml

@@ -19,11 +19,7 @@
     <developerConnection>scm:git:git@github.com:firebase/geofire-java.git</developerConnection>
     <url>https://github.com/firebase/geofire-java</url>
   </scm>
-  <parent>
-    <groupId>org.sonatype.oss</groupId>
-    <artifactId>oss-parent</artifactId>
-    <version>7</version>
-  </parent>
+
   <licenses>
     <license>
       <name>MIT</name>
@@ -39,7 +35,25 @@
       <module>java</module>
   </modules>
 
+  <distributionManagement>
+    <repository>
+        <id>geofire</id>
+        <url>https://api.bintray.com/maven/firebase/geofire/geofire</url>
+    </repository>
+  </distributionManagement>
+
   <build>
+    <!--
+       Add -Dbuildtime.output.log=true to profile maven task times.
+    -->
+    <extensions>
+        <extension>
+            <groupId>co.leantechniques</groupId>
+            <artifactId>maven-buildtime-extension</artifactId>
+            <version>2.0.3</version>
+        </extension>
+    </extensions>
+
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -84,6 +98,7 @@
       </plugin>
     </plugins>
   </build>
+
   <dependencies>
     <!-- Dependencies defined in child POMs -->
   </dependencies>

release.sh

@@ -49,7 +49,7 @@ fi
 ###################
 read -p "Next, make sure this repo is clean and up to date. We will be kicking off a deploy to maven." DERP
 mvn clean
-mvn release:clean release:prepare release:perform -Dtag=v$VERSION
+mvn -s settings.xml release:clean release:prepare release:perform -Darguments="-DskipTests" -Dtag=v$VERSION
 
 if [[ $? -ne 0 ]]; then
   echo "error: Error building and releasing to maven."

settings.xml

@@ -0,0 +1,44 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<settings
+  xsi:schemaLocation='http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd'
+  xmlns='http://maven.apache.org/SETTINGS/1.0.0'
+  xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
+
+  <servers>
+    <server>
+      <id>geofire</id>
+      <username>${env.BINTRAY_USER}</username>
+      <password>${env.BINTRAY_KEY}</password>
+    </server>
+  </servers>
+
+  <profiles>
+    <profile>
+        <repositories>
+            <repository>
+                <snapshots>
+                    <enabled>false</enabled>
+                </snapshots>
+                <id>central</id>
+                <name>bintray</name>
+                <url>http://jcenter.bintray.com</url>
+            </repository>
+        </repositories>
+        <pluginRepositories>
+            <pluginRepository>
+                <snapshots>
+                    <enabled>false</enabled>
+                </snapshots>
+                <id>central</id>
+                <name>bintray-plugins</name>
+                <url>http://jcenter.bintray.com</url>
+            </pluginRepository>
+        </pluginRepositories>
+        <id>bintray</id>
+    </profile>
+  </profiles>
+
+  <activeProfiles>
+      <activeProfile>bintray</activeProfile>
+  </activeProfiles>
+</settings>

src/test/java/com/firebase/geofire/RealDataTest.java

@@ -17,8 +17,8 @@
 
 public class RealDataTest {
 
-    private static final String DATABASE_URL = "https://databaseName.firebaseio.com/";
-    private static final String SERVICE_ACCOUNT_CREDENTIALS = "path/to/serviceAccountCredentials.json";
+    private static final String DATABASE_URL = "https://geofiretest-8d811.firebaseio.com/";
+    private static final String SERVICE_ACCOUNT_CREDENTIALS = "service-account.json";
 
     DatabaseReference databaseReference;