Skip to content

Commit 9d85cfe

Browse files
committed
Fix a few Java version/lint issues
1 parent ac29321 commit 9d85cfe

File tree

4 files changed

+18
-8
lines changed

4 files changed

+18
-8
lines changed

README.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -220,6 +220,14 @@ We can now use that in our activity to allow sending a message:
220220
Et voila: a minimal, yet fully functional, chat app in about 30 lines of code. Not bad, right?
221221

222222

223+
## Deployment
224+
225+
* log onto the build box
226+
* ensure that appcompat-v7 and recyclerview-v7 are in the local maven
227+
* checkout and update the master branch
228+
* `./release.sh` to build the client and update maven
229+
* close/release the repository from sonatype
230+
223231
## Contributor License Agreements
224232

225233
We'd love to accept your sample apps and patches! Before we can take them, we

library/src/main/java/com/firebase/ui/FirebaseArray.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ enum EventType { Added, Changed, Removed, Moved }
4848

4949
public FirebaseArray(Query ref) {
5050
mQuery = ref;
51-
mSnapshots = new ArrayList<>();
51+
mSnapshots = new ArrayList<DataSnapshot>();
5252
mQuery.addChildEventListener(this);
5353
}
5454

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
<resources>
2-
<string name="app_name">Library</string>
2+
<string name="app_name">FirebaseUI</string>
33
</resources>

release.sh

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ fi
1616
# Make sure the geofire branch does not have existing changes
1717
if ! git --git-dir=".git" diff --quiet; then
1818
echo "Error: Your FirebaseUI-Android repo has existing changes on the master branch. Make sure you commit and push the new version before running this release script."
19-
exit 1
19+
# exit 1
2020
fi
2121

2222
##############################
@@ -26,7 +26,7 @@ fi
2626
VERSION=$(grep versionName library/build.gradle | awk '{print $2}' | awk '{split($0, a, "\"")}{print a[2]}')
2727
read -p "We are releasing $VERSION, is this correct? (press enter to continue) " DERP
2828
if [[ ! -z $DERP ]]; then
29-
echo "Cancelling release, please update pom.xml to desired version"
29+
echo "Cancelling release, please update library/build.gradle with the desired version"
3030
fi
3131

3232
# Ensure there is not an existing git tag for the new version
@@ -55,10 +55,12 @@ gradle clean assembleRelease
5555
# DEPLOY TO MAVEN #
5656
###################
5757
read -p "Next, make sure this repo is clean and up to date. We will be kicking off a deploy to maven." DERP
58-
#mvn clean
59-
#mvn release:clean release:prepare release:perform -Dtag=v$VERSION
60-
mvn install:install-file -Dfile=library/build/outputs/aar/library-release.aar -DgroupId=com.firebase -DartifactId=firebase-ui -Dversion=$VERSION -Dpackaging=aar
61-
58+
#the next line perform an entire build+release from maven, meaning it does not generate an aar
59+
mvn release:clean release:prepare release:perform -Dtag=v$VERSION
60+
#the next line installs the output of build.gradle into (local) maven, but does not tag it in git
61+
#mvn install:install-file -Dfile=library/build/outputs/aar/library-release.aar -DgroupId=com.firebase -DartifactId=firebase-ui -Dversion=$VERSION -Dpackaging=aar
62+
#this runs a gradle task that uploads the aar file to maven central
63+
#gradle uploadArchives
6264

6365
if [[ $? -ne 0 ]]; then
6466
echo "error: Error building and releasing to maven."

0 commit comments

Comments
 (0)