Skip to content

Commit 1e3effa

Browse files
author
michelou
committed
added LocationInfo and MyMoviesDatabase, updated config files
1 parent 4077f11 commit 1e3effa

File tree

283 files changed

+6156
-928
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

283 files changed

+6156
-928
lines changed

android-app-dev/TriviaQuiz/ant.properties

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,19 +21,13 @@ key.alias=android-app-dev
2121
key.store.password=android
2222
key.alias.password=android
2323

24-
# By adding the following two lines to the imported Ant script file
25-
# ${sdk.dir}/tools/ant/main_rules.xml :
26-
# <property name="javac.args" value="-nowarn" />
27-
# <compilerarg line="${javac.args}"/> <!-- 'compile' target -->
28-
# you can specify additional compiler arguments (e.g. to generate detailed
29-
# warning messages):
30-
# javac.args=-deprecation -Xlint
24+
# You can use this to specify compiler arguments for Java:
25+
# 'java.compilerargs' (eg. java.compilerargs=-deprecation -Xlint)
3126

3227
sdk.dir=/opt/android-sdk-linux_x86
3328

3429
scala.dir=/opt/scala
35-
36-
scalac.addparams=-deprecation
30+
scala.compilerargs=-deprecation
3731

3832
#proguard.dir=/opt/proguard
3933
proguard.dir=${sdk.dir}/tools/proguard

android-app-dev/TriviaQuiz/build-scala.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
<property
2020
name="scalac.banner"
2121
value="Scala compiler version ${scala.version.number} - http://scala-lang.org" />
22+
<property name="scala.compilerargs" value="" />
2223

2324
<!-- Rules -->
2425

@@ -39,7 +40,7 @@
3940
<scalac
4041
destdir="${out.classes.absolute.dir}"
4142
bootclasspathref="android.target.classpath"
42-
logging="${logging}" addparams="${scalac.addparams}"
43+
logging="${logging}" addparams="${scala.compilerargs}"
4344
classpath="${extensible.classpath}"
4445
classpathref="jar.libs.ref">
4546
<src path="${source.absolute.dir}" />

android-app-dev/TriviaQuiz/tests/ant.properties

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,19 @@
1515
# 'key.alias' for the name of the key to use.
1616
# The password will be asked during the build when you use the 'release' target.
1717

18-
# By adding the following two lines to the imported Ant script file
19-
# platforms/android-<level>/ant/ant_rules_r2.xml :
20-
# <property name="javac.args" value="-nowarn" />
21-
# <compilerarg line="${javac.args}"/> <!-- 'compile' target -->
22-
# you can specify additional compiler arguments (e.g. to generate detailed
23-
# warning messages):
24-
# javac.args=-deprecation -Xlint
18+
key.store=${user.home}/.android/release.keystore
19+
key.alias=android-app-dev
20+
21+
key.store.password=android
22+
key.alias.password=android
23+
24+
# You can use this to specify compiler arguments for Java:
25+
# 'java.compilerargs' (eg. java.compilerargs=-deprecation -Xlint)
2526

2627
sdk.dir=/opt/android-sdk-linux_x86
2728

2829
scala.dir=/opt/scala
29-
30-
scalac.addparams=-deprecation
30+
scala.compilerargs=-deprecation
3131

3232
#proguard.dir=/opt/proguard
3333
proguard.dir=${sdk.dir}/tools/proguard

android-app-dev/configs/ant/build-scala.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
<property
2020
name="scalac.banner"
2121
value="Scala compiler version ${scala.version.number} - http://scala-lang.org" />
22+
<property name="scala.compilerargs" value="" />
2223

2324
<!-- Rules -->
2425

@@ -39,7 +40,7 @@
3940
<scalac
4041
destdir="${out.classes.absolute.dir}"
4142
bootclasspathref="android.target.classpath"
42-
logging="${logging}" addparams="${scalac.addparams}"
43+
logging="${logging}" addparams="${scala.compilerargs}"
4344
classpath="${extensible.classpath}"
4445
classpathref="jar.libs.ref">
4546
<src path="${source.absolute.dir}" />

android-essentials/ContentReceiverExample/ant.properties

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,19 +21,13 @@ key.alias=android-essentials
2121
key.store.password=android
2222
key.alias.password=android
2323

24-
# By adding the following two lines to the imported Ant script file
25-
# ${sdk.dir}/tools/ant/main_rules.xml :
26-
# <property name="javac.args" value="-nowarn" />
27-
# <compilerarg line="${javac.args}"/> <!-- 'compile' target -->
28-
# you can specify additional compiler arguments (e.g. to generate detailed
29-
# warning messages):
30-
# javac.args=-deprecation -Xlint
24+
# You can use this to specify compiler arguments for Java:
25+
# 'java.compilerargs' (eg. java.compilerargs=-deprecation -Xlint)
3126

3227
sdk.dir=/opt/android-sdk-linux_x86
3328

3429
scala.dir=/opt/scala
35-
36-
scalac.addparams=-deprecation
30+
scala.compilerargs=-deprecation
3731

3832
#proguard.dir=/opt/proguard
3933
proguard.dir=${sdk.dir}/tools/proguard

android-in-practice/DealDroid/.project

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<projectDescription>
33
<name>aip-ch02-DealDroid</name>
44
<comment>
5-
Android in Practice
5+
Android in Practice
66
</comment>
77
<projects>
88
</projects>

android-in-practice/DealDroid/ant.properties

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,19 +21,14 @@ key.alias=android-in-practice
2121
key.store.password=android
2222
key.alias.password=android
2323

24-
# By adding the following two lines to the imported Ant script file
25-
# ${sdk.dir}/tools/ant/main_rules.xml :
26-
# <property name="javac.args" value="-nowarn" />
27-
# <compilerarg line="${javac.args}"/> <!-- 'compile' target -->
28-
# you can specify additional compiler arguments (e.g. to generate detailed
29-
# warning messages):
30-
# javac.args=-deprecation -Xlint
24+
# You can use this to specify compiler arguments for Java:
25+
# 'java.compilerargs' (eg. java.compilerargs=-deprecation -Xlint)
3126

3227
sdk.dir=/opt/android-sdk-linux_x86
3328

3429
scala.dir=/opt/scala
3530

36-
scalac.addparams=-deprecation
31+
scala.compilerargs=-deprecation
3732

3833
#proguard.dir=/opt/proguard
3934
proguard.dir=${sdk.dir}/tools/proguard

android-in-practice/DealDroid/build-scala.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
<property
2020
name="scalac.banner"
2121
value="Scala compiler version ${scala.version.number} - http://scala-lang.org" />
22+
<property name="scala.compilerargs" value="" />
2223

2324
<!-- Rules -->
2425

@@ -39,7 +40,7 @@
3940
<scalac
4041
destdir="${out.classes.absolute.dir}"
4142
bootclasspathref="android.target.classpath"
42-
logging="${logging}" addparams="${scalac.addparams}"
43+
logging="${logging}" addparams="${scala.compilerargs}"
4344
classpath="${extensible.classpath}"
4445
classpathref="jar.libs.ref">
4546
<src path="${source.absolute.dir}" />

android-in-practice/DealDroidWithService/ant.properties

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,19 +21,14 @@ key.alias=android-in-practice
2121
key.store.password=android
2222
key.alias.password=android
2323

24-
# By adding the following two lines to the imported Ant script file
25-
# ${sdk.dir}/tools/ant/main_rules.xml :
26-
# <property name="javac.args" value="-nowarn" />
27-
# <compilerarg line="${javac.args}"/> <!-- 'compile' target -->
28-
# you can specify additional compiler arguments (e.g. to generate detailed
29-
# warning messages):
30-
# javac.args=-deprecation -Xlint
24+
# You can use this to specify compiler arguments for Java:
25+
# 'java.compilerargs' (eg. java.compilerargs=-deprecation -Xlint)
3126

3227
sdk.dir=/opt/android-sdk-linux_x86
3328

3429
scala.dir=/opt/scala
3530

36-
scalac.addparams=-deprecation
31+
scala.compilerargs=-deprecation
3732

3833
#proguard.dir=/opt/proguard
3934
proguard.dir=${sdk.dir}/tools/proguard

android-in-practice/DealDroidWithService/build-scala.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
<property
2020
name="scalac.banner"
2121
value="Scala compiler version ${scala.version.number} - http://scala-lang.org" />
22+
<property name="scala.compilerargs" value="" />
2223

2324
<!-- Rules -->
2425

@@ -39,7 +40,7 @@
3940
<scalac
4041
destdir="${out.classes.absolute.dir}"
4142
bootclasspathref="android.target.classpath"
42-
logging="${logging}" addparams="${scalac.addparams}"
43+
logging="${logging}" addparams="${scala.compilerargs}"
4344
classpath="${extensible.classpath}"
4445
classpathref="jar.libs.ref">
4546
<src path="${source.absolute.dir}" />

0 commit comments

Comments
 (0)