Skip to content

Commit 8ed8401

Browse files
committed
Added option to generate docs, use gradle for build
1 parent c1ae0d4 commit 8ed8401

File tree

4 files changed

+25
-7
lines changed

4 files changed

+25
-7
lines changed

library/build.gradle

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,16 @@ android {
2222
exclude 'META-INF/NOTICE'
2323
}
2424
}
25-
25+
//android.libraryVariants.all { variant ->
26+
// task("generate${variant.name.capitalize()}Javadoc", type: Javadoc) {
27+
// description "Generates Javadoc for $variant.name."
28+
// source = variant.javaCompile.source
29+
// ext.androidJar = "${android.sdkDirectory}/platforms/${android.compileSdkVersion}/android.jar"
30+
// classpath = files(variant.javaCompile.classpath.files) + files(ext.androidJar)
31+
// options.links("http://docs.oracle.com/javase/7/docs/api/");
32+
// options.links("http://d.android.com/reference/");
33+
// }
34+
//}
2635
dependencies {
2736
compile fileTree(dir: 'libs', include: ['*.jar'])
2837
compile 'com.android.support:appcompat-v7:22.2.0'

library/library.iml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@
6565
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
6666
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
6767
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
68+
<excludeFolder url="file://$MODULE_DIR$/build/docs" />
6869
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
6970
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
7071
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ public View getView(int i, View view, ViewGroup viewGroup) {
122122
/**
123123
* Each time the data at the given Firebase location changes, this method will be called for each item that needs
124124
* to be displayed. The arguments correspond to the mLayout and mModelClass given to the constructor of this class.
125-
* <p/>
125+
* <p>
126126
* Your implementation should populate the view using the data contained in the model.
127127
*
128128
* @param v The view to populate

release.sh

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ fi
2323
# VALIDATE CLIENT VERSIONS #
2424
##############################
2525

26-
#VERSION=$(grep version pom.xml |head -2|tail -1|awk -F '>' '{print $2}'|awk -F '<' '{print $1}'|awk -F '-' '{print $1}')
2726
VERSION=$(grep versionName library/build.gradle | awk '{print $2}' | awk '{split($0, a, "\"")}{print a[2]}')
2827
read -p "We are releasing $VERSION, is this correct? (press enter to continue) " DERP
2928
if [[ ! -z $DERP ]]; then
@@ -45,12 +44,21 @@ fi
4544
# exit 1
4645
#fi
4746

47+
##########################
48+
# GENERATE RELEASE BUILD #
49+
##########################
50+
51+
#gradle clean assembleRelease generateReleaseJavadoc
52+
gradle clean assembleRelease
53+
4854
###################
4955
# DEPLOY TO MAVEN #
5056
###################
5157
read -p "Next, make sure this repo is clean and up to date. We will be kicking off a deploy to maven." DERP
52-
mvn clean
53-
mvn release:clean release:prepare release:perform -Dtag=v$VERSION
58+
#mvn clean
59+
#mvn release:clean release:prepare release:perform -Dtag=v$VERSION
60+
#mvn install:install-file -Dfile=/Users/puf/Github/FirebaseUI-Android/library/build/outputs/aar/library-release.aar -DgroupId=com.firebase -DartifactId=firebase-ui -Dversion=0.0.3 -Dpackaging=aar
61+
5462

5563
if [[ $? -ne 0 ]]; then
5664
echo "error: Error building and releasing to maven."
@@ -64,7 +72,7 @@ fi
6472
# Push the new git tag created by Maven
6573
git push --tags
6674
if [[ $? -ne 0 ]]; then
67-
echo "Error: Failed to do 'git push --tags' from geofire repo."
75+
echo "Error: Failed to do 'git push --tags' from FirebaseUI-Android repo."
6876
exit 1
6977
fi
7078

@@ -75,7 +83,7 @@ fi
7583
echo "Manual steps:"
7684
echo " 1) release maven repo at http://oss.sonatype.org/"
7785
echo " 2) Deploy new docs: $> firebase deploy"
78-
echo " 3) Update the release notes for FirebaseUI-Android version ${VERSION} on GitHub and add jars for downloading"
86+
echo " 3) Update the release notes for FirebaseUI-Android version ${VERSION} on GitHub and add aar for downloading"
7987
echo " 4) Update firebase-versions.json in the firebase-clients repo with the changelog information"
8088
echo " 5) Tweet @FirebaseRelease: 'v${VERSION} of FirebaseUI-Android is available https://github.com/firebase/FirebaseUI-Android"
8189
echo ---

0 commit comments

Comments
 (0)