Skip to content

Commit 5dd83f9

Browse files
committed
[Issue 147] Include properties files for Eclipse Android support to specify location of source jar in base library.
http://codereview.appspot.com/6478059/
1 parent e90c34f commit 5dd83f9

17 files changed

+26
-1
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
src=../libs-sources/google-http-client-${project.version}-sources.jar
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
src=../libs-sources/google-http-client-android-${project.version}-sources.jar
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
src=../libs-sources/google-http-client-android2-${project.version}-sources.jar
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
src=../libs-sources/google-http-client-android3-${project.version}-sources.jar
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
src=../libs-sources/google-http-client-gson-${project.version}-sources.jar
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
src=../libs-sources/google-http-client-jackson-${project.version}-sources.jar
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
src=../libs-sources/google-http-client-jackson2-${project.version}-sources.jar
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
src=../libs-sources/google-http-client-protobuf-${project.version}-sources.jar
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
src=../libs-sources/gson-${project.gson.version}-sources.jar
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
src=../libs-sources/guava-${project.guava.version}-sources.jar
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
src=../libs-sources/jackson-core-${project.jackson-core2.version}-sources.jar
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
src=../libs-sources/jackson-core-asl-${project.jackson-core-asl.version}-sources.jar
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
src=../libs-sources/protobuf-java-${project.protobuf-java.version}-sources.jar

google-http-client-assembly/assembly.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,11 @@
3030
<directory>target/libs</directory>
3131
<outputDirectory>libs</outputDirectory>
3232
</fileSet>
33+
<fileSet>
34+
<directory>android-properties</directory>
35+
<outputDirectory>libs</outputDirectory>
36+
<filtered>true</filtered>
37+
</fileSet>
3338
<fileSet>
3439
<directory>target/libs-sources</directory>
3540
<outputDirectory>libs-sources</outputDirectory>

google-http-client-assembly/readme.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@ <h3>Android Dependencies</h3>
102102
</ul>
103103
</li>
104104
</ul>
105+
The <a href='libs'>libs</a> folder also contains properties files that specify the location of source jars for Android projects in Eclipse.<br/>
105106
Please see the <a href='http://code.google.com/p/google-http-java-client/wiki/Android'>Android wiki</a> for the Android Developer's Guide.
106107

107108
<h3>Google App Engine Dependencies</h3>

pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@
5757
(use mvn project-info-reports:dependencies and copy from
5858
google-http-client-<name>/target/site/dependencies.html)
5959
* jdiff.xml
60+
* google-http-client-assembly/android-properties/*.properties
6061
* This pom.xml file below in the dependencyManagement and maven-javadoc-plugin sections
6162
-->
6263
<modules>

release.html

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@ <h3>Fork version 1.11.0-beta</h3>
9797
ESC_VER_NEXT=`esc ${VER_NEXT}`; ESC_VER_CUR=`esc ${VER_CUR}`; ESC_VER_PREV=`esc ${VER_PREV}`
9898
sed -i "s@${ESC_VER_CUR}${VER_SUFFIX}@${ESC_VER_NEXT}${VER_SUFFIX}@g" pom.xml
9999
sed -i "s@${ESC_VER_CUR}${VER_SUFFIX}@${ESC_VER_NEXT}${VER_SUFFIX}@g" */pom.xml
100+
for filename in google-http-client-assembly/android-properties/*.properties; do newname=`echo $filename | sed -e "s@${ESC_VER_CUR}${VER_SUFFIX}@${ESC_VER_NEXT}${VER_SUFFIX}@g"`; mv $filename google-http-client-assembly/android-properties/$newname; done
100101
sed -i -e "s@${ESC_VER_CUR}${VER_SUFFIX}@${ESC_VER_NEXT}${VER_SUFFIX}@g" -e "s@${ESC_VER_PREV}${VER_SUFFIX}@${ESC_VER_CUR}${VER_SUFFIX}@g" jdiff.xml
101102
sed -i "s@${ESC_VER_CUR}${VER_SUFFIX}@${ESC_VER_NEXT}${VER_SUFFIX}@g" google-http-client/src/main/java/com/google/api/client/http/HttpRequest.java
102103
sed -i -e "s@${ESC_VER_CUR}@${ESC_VER_NEXT}@g" -e "s@${ESC_VER_PREV}@${ESC_VER_CUR}@g" release.html
@@ -114,7 +115,7 @@ <h3>Release version 1.11.0-beta</h3>
114115
This process is followed for the official launch. We are releasing the code from
115116
the 1.11 Mercurial branch.
116117
<ul>
117-
<li>Checkout the source, update dependencies.html, update the version constant, and push to central Maven repository (based on instructions from <a
118+
<li>Checkout the source, update dependencies.html, update the version constant, update android-properties, and push to central Maven repository (based on instructions from <a
118119
href="https://docs.sonatype.org/display/Repository/Sonatype+OSS+Maven+Repository+Usage+Guide">Sonatype
119120
OSS Maven Repository Usage Guide</a>):<pre>
120121
cd /tmp
@@ -137,6 +138,9 @@ <h3>Release version 1.11.0-beta</h3>
137138

138139
sed s/-SNAPSHOT//g &lt;google-http-client/src/main/java/com/google/api/client/http/HttpRequest.java &gt;/tmp/HttpRequest.java
139140
cp /tmp/HttpRequest.java google-http-client/src/main/java/com/google/api/client/http
141+
142+
for filename in google-http-client-assembly/android-properties/*.properties; do newname=`echo $filename | sed -e 's/-SNAPSHOT//g'`; mv $filename google-http-client-assembly/android-properties/$newname; done
143+
140144
hg commit -m "prepare 1.11.0-beta for release"
141145
hg push
142146

@@ -159,6 +163,7 @@ <h3>Release version 1.11.0-beta</h3>
159163
</li>
160164
<li>Start development of next bug fix version, by replacing <code>1.11.0-beta</code> with the next bug fix version:<pre>
161165
NEXT_VERSION=<i>(next bug fix version 1.11.X-beta)</i>
166+
for filename in google-http-client-assembly/android-properties/*.properties; do newname=`echo $filename | sed -e 's/1.11.0-beta/$NEXT_VERSION/g'`; mv $filename google-http-client-assembly/android-properties/$newname; done
162167
sed s/1.11.0-beta/$NEXT_VERSION/g &lt;jdiff.xml &gt;/tmp/jdiff.xml
163168
sed s/1.11.0-beta/$NEXT_VERSION/g &lt;release.html &gt;/tmp/release.html
164169
sed s/1.11.0-beta/$NEXT_VERSION-SNAPSHOT/g &lt;google-http-client/src/main/java/com/google/api/client/util/Strings.java &gt;/tmp/Strings.java

0 commit comments

Comments
 (0)