Merge lp:~karni/ubuntuone-android-music/update-project into lp:ubuntuone-android-music

Proposed by Michał Karnicki on 2012-03-02
Status: Merged
Approved by: Chad Miller on 2012-03-02
Approved revision: 565
Merged at revision: 565
Proposed branch: lp:~karni/ubuntuone-android-music/update-project
Merge into: lp:ubuntuone-android-music
Diff against target: 255 lines (+105/-94)
6 files modified
AndroidManifest.xml (+3/-3)
ant.properties (+19/-0)
build.properties (+0/-19)
build.xml (+71/-60)
default.properties (+0/-12)
project.properties (+12/-0)
To merge this branch: bzr merge lp:~karni/ubuntuone-android-music/update-project
Reviewer Review Type Date Requested Status
Chad Miller 2012-03-02 Pending
Review via email: mp+95654@code.launchpad.net

Commit message

Updated project setup.

Description of the change

Updated project setup with android project update.
Updated targetSdkVersion to 8 (to handle installLocation tag).
Bump versionCode and versionName.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'AndroidManifest.xml'
2--- AndroidManifest.xml 2012-02-15 15:23:27 +0000
3+++ AndroidManifest.xml 2012-03-02 19:46:30 +0000
4@@ -3,8 +3,8 @@
5 xmlns:a="http://schemas.android.com/apk/res/android"
6 package="net.sourceforge.subsonic.u1m"
7 a:installLocation="preferExternal"
8- a:versionCode="18"
9- a:versionName="1.6.1">
10+ a:versionCode="565"
11+ a:versionName="1.6.2">
12
13 <uses-permission a:name="android.permission.INTERNET"/>
14 <uses-permission a:name="android.permission.READ_PHONE_STATE"/>
15@@ -12,7 +12,7 @@
16 <uses-permission a:name="android.permission.WAKE_LOCK"/>
17 <uses-permission a:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
18
19- <uses-sdk a:minSdkVersion="4" a:targetSdkVersion="7"/>
20+ <uses-sdk a:minSdkVersion="4" a:targetSdkVersion="8"/>
21
22 <supports-screens a:anyDensity="true" a:largeScreens="true" a:normalScreens="true" a:smallScreens="true"/>
23
24
25=== added file 'ant.properties'
26--- ant.properties 1970-01-01 00:00:00 +0000
27+++ ant.properties 2012-03-02 19:46:30 +0000
28@@ -0,0 +1,19 @@
29+# This file is used to override default values used by the Ant build system.
30+#
31+# This file must be checked in Version Control Systems, as it is
32+# integral to the build system of your project.
33+
34+# This file is only used by the Ant script.
35+
36+# You can use this to override default values such as
37+# 'source.dir' for the location of your java source folder and
38+# 'out.dir' for the location of your output folder.
39+
40+# You can also use it define how the release builds are signed by declaring
41+# the following properties:
42+# 'key.store' for the location of your keystore and
43+# 'key.alias' for the name of the key to use.
44+# The password will be asked during the build when you use the 'release' target.
45+
46+key.alias=u1androidofficial
47+key.store=../../U1AndroidOfficial.keystore
48
49=== removed file 'build.properties'
50--- build.properties 2010-12-07 14:12:06 +0000
51+++ build.properties 1970-01-01 00:00:00 +0000
52@@ -1,19 +0,0 @@
53-# This file is used to override default values used by the Ant build system.
54-#
55-# This file must be checked in Version Control Systems, as it is
56-# integral to the build system of your project.
57-
58-# This file is only used by the Ant script.
59-
60-# You can use this to override default values such as
61-# 'source.dir' for the location of your java source folder and
62-# 'out.dir' for the location of your output folder.
63-
64-# You can also use it define how the release builds are signed by declaring
65-# the following properties:
66-# 'key.store' for the location of your keystore and
67-# 'key.alias' for the name of the key to use.
68-# The password will be asked during the build when you use the 'release' target.
69-
70-key.store=../../U1AndroidOfficial.keystore
71-key.alias=u1androidofficial
72
73=== modified file 'build.xml'
74--- build.xml 2011-08-17 02:42:19 +0000
75+++ build.xml 2012-03-02 19:46:30 +0000
76@@ -1,74 +1,85 @@
77 <?xml version="1.0" encoding="UTF-8"?>
78-<project name="ubuntu-one-music" default="debug">
79+<project name="ubuntuone-android-files" default="help">
80
81 <!-- The local.properties file is created and updated by the 'android' tool.
82- It contains the path to the SDK. It should *NOT* be checked in in Version
83- Control Systems. -->
84+ It contains the path to the SDK. It should *NOT* be checked into
85+ Version Control Systems. -->
86 <property file="local.properties" />
87
88- <!-- The build.properties file can be created by you and is never touched
89- by the 'android' tool. This is the place to change some of the default property values
90- used by the Ant rules.
91+ <!-- The ant.properties file can be created by you. It is only edited by the
92+ 'android' tool to add properties to it.
93+ This is the place to change some Ant specific build properties.
94 Here are some properties you may want to change/update:
95
96- application.package
97- the name of your application package as defined in the manifest. Used by the
98- 'uninstall' rule.
99 source.dir
100- the name of the source directory. Default is 'src'.
101+ The name of the source directory. Default is 'src'.
102 out.dir
103- the name of the output directory. Default is 'bin'.
104-
105- Properties related to the SDK location or the project target should be updated
106- using the 'android' tool with the 'update' action.
107-
108- This file is an integral part of the build system for your application and
109- should be checked in in Version Control Systems.
110+ The name of the output directory. Default is 'bin'.
111+
112+ For other overridable properties, look at the beginning of the rules
113+ files in the SDK, at tools/ant/build.xml
114+
115+ Properties related to the SDK location or the project target should
116+ be updated using the 'android' tool with the 'update' action.
117+
118+ This file is an integral part of the build system for your
119+ application and should be checked into Version Control Systems.
120
121 -->
122- <property file="build.properties" />
123-
124- <!-- The default.properties file is created and updated by the 'android' tool, as well
125- as ADT.
126- This file is an integral part of the build system for your application and
127- should be checked in in Version Control Systems. -->
128- <property file="default.properties" />
129-
130- <!-- Custom Android task to deal with the project target, and import the proper rules.
131- This requires ant 1.6.0 or above. -->
132- <path id="android.antlibs">
133- <pathelement path="${sdk.dir}/tools/lib/anttasks.jar" />
134- <pathelement path="${sdk.dir}/tools/lib/sdklib.jar" />
135- <pathelement path="${sdk.dir}/tools/lib/androidprefs.jar" />
136- <pathelement path="${sdk.dir}/tools/lib/apkbuilder.jar" />
137- <pathelement path="${sdk.dir}/tools/lib/jarutils.jar" />
138- </path>
139-
140- <taskdef name="setup"
141- classname="com.android.ant.SetupTask"
142- classpathref="android.antlibs" />
143-
144- <!-- Execute the Android Setup task that will setup some properties specific to the target,
145- and import the build rules files.
146-
147- The rules file is imported from
148- <SDK>/platforms/<target_platform>/templates/android_rules.xml
149-
150- To customize some build steps for your project:
151- - copy the content of the main node <project> from android_rules.xml
152- - paste it in this build.xml below the <setup /> task.
153- - disable the import by changing the setup task below to <setup import="false" />
154-
155- This will ensure that the properties are setup correctly but that your customized
156- build steps are used.
157+ <property file="ant.properties" />
158+
159+ <!-- The project.properties file is created and updated by the 'android'
160+ tool, as well as ADT.
161+
162+ This contains project specific properties such as project target, and library
163+ dependencies. Lower level build properties are stored in ant.properties
164+ (or in .classpath for Eclipse projects).
165+
166+ This file is an integral part of the build system for your
167+ application and should be checked into Version Control Systems. -->
168+ <loadproperties srcFile="project.properties" />
169+
170+ <!-- quick check on sdk.dir -->
171+ <fail
172+ message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through an env var"
173+ unless="sdk.dir"
174+ />
175+
176+
177+<!-- extension targets. Uncomment the ones where you want to do custom work
178+ in between standard targets -->
179+<!--
180+ <target name="-pre-build">
181+ </target>
182+ <target name="-pre-compile">
183+ </target>
184+
185+ /* This is typically used for code obfuscation.
186+ Compiled code location: ${out.classes.absolute.dir}
187+ If this is not done in place, override ${out.dex.input.absolute.dir} */
188+ <target name="-post-compile">
189+ </target>
190+-->
191+
192+ <!-- Import the actual build file.
193+
194+ To customize existing targets, there are two options:
195+ - Customize only one target:
196+ - copy/paste the target into this file, *before* the
197+ <import> task.
198+ - customize it to your needs.
199+ - Customize the whole content of build.xml
200+ - copy/paste the content of the rules files (minus the top node)
201+ into this file, replacing the <import> task.
202+ - customize to your needs.
203+
204+ ***********************
205+ ****** IMPORTANT ******
206+ ***********************
207+ In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
208+ in order to avoid having your file be overridden by tools such as "android update project"
209 -->
210- <setup />
211-
212-
213- <target name="analytics-library" description="Install analytics">
214-<!-- test -f libs/libGoogleAnalytics.jar || { wget -O googanalytics.zip http://dl.google.com/gaformobileapps/GoogleAnalyticsAndroid_1.2.zip && unzip -j -d libs -o googanalytics.zip libGoogleAnalytics.jar; rm -f googanalytics.zip; }
215--->
216- </target>
217-
218+ <!-- version-tag: 1 -->
219+ <import file="${sdk.dir}/tools/ant/build.xml" />
220
221 </project>
222
223=== removed file 'default.properties'
224--- default.properties 2011-11-04 13:33:04 +0000
225+++ default.properties 1970-01-01 00:00:00 +0000
226@@ -1,12 +0,0 @@
227-# This file is automatically generated by Android Tools.
228-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
229-#
230-# This file must be checked in Version Control Systems.
231-#
232-# To customize properties used by the Ant build system use,
233-# "build.properties", and override values to adapt the script to your
234-# project structure.
235-
236-# Project target.
237-target=android-8
238-android.library.reference.1=../../ubuntuone-android-sso/ubuntuone-android-sso
239
240=== added file 'project.properties'
241--- project.properties 1970-01-01 00:00:00 +0000
242+++ project.properties 2012-03-02 19:46:30 +0000
243@@ -0,0 +1,12 @@
244+# This file is automatically generated by Android Tools.
245+# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
246+#
247+# This file must be checked in Version Control Systems.
248+#
249+# To customize properties used by the Ant build system use,
250+# "ant.properties", and override values to adapt the script to your
251+# project structure.
252+
253+android.library.reference.1=../../ubuntuone-android-sso/ubuntuone-android-sso
254+# Project target.
255+target=android-8

Subscribers

People subscribed via source and target branches

to status/vote changes: