From 3b4e91e33f21a29aa072c172b0abcd1c3e37ce55 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Alexis=20Laferri=C3=A8re?= Date: Tue, 31 Mar 2015 15:25:05 -0400 Subject: [PATCH] lib & examples: update modules using the java_package annotation MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Alexis Laferrière --- examples/calculator/src/calculator_android.nit | 2 +- examples/mnit_dino/src/dino_android.nit | 2 +- .../mnit_simple/src/complete_simple_android.nit | 4 ++-- lib/android/README.md | 2 +- lib/android/examples/src/ui_test.nit | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/examples/calculator/src/calculator_android.nit b/examples/calculator/src/calculator_android.nit index ec7b374..1b1e686 100644 --- a/examples/calculator/src/calculator_android.nit +++ b/examples/calculator/src/calculator_android.nit @@ -18,7 +18,7 @@ module calculator_android is app_name "app.nit Calc." app_version(0, 1, git_revision) - java_package "org.nitlanguage.calculator" + app_namespace "org.nitlanguage.calculator" # Lock in portrait mode android_manifest_activity """android:screenOrientation="portrait"""" diff --git a/examples/mnit_dino/src/dino_android.nit b/examples/mnit_dino/src/dino_android.nit index aac6d47..be92d49 100644 --- a/examples/mnit_dino/src/dino_android.nit +++ b/examples/mnit_dino/src/dino_android.nit @@ -15,7 +15,7 @@ # limitations under the License. module dino_android is - java_package("org.nitlanguage.dino") + app_namespace "org.nitlanguage.dino" end import dino diff --git a/examples/mnit_simple/src/complete_simple_android.nit b/examples/mnit_simple/src/complete_simple_android.nit index 8700ab2..f8cff4f 100644 --- a/examples/mnit_simple/src/complete_simple_android.nit +++ b/examples/mnit_simple/src/complete_simple_android.nit @@ -15,8 +15,8 @@ # limitations under the License. module complete_simple_android is - java_package("org.nitlanguage.test_all") - target_api_version(19) + app_namespace "org.nitlanguage.test_all" + target_api_version 19 end import test_bundle diff --git a/lib/android/README.md b/lib/android/README.md index 41f4830..fb11c65 100644 --- a/lib/android/README.md +++ b/lib/android/README.md @@ -32,7 +32,7 @@ as the launcher name. Example: `app_name "My App"` -* `java_package` specifies the package used by the generated Java +* `app_namespace` specifies the package used by the generated Java classes and the APK file. Once the application is published, this value should not be changed. By default, the compiler will use the package `org.nitlanguage.{module_name}`. diff --git a/lib/android/examples/src/ui_test.nit b/lib/android/examples/src/ui_test.nit index f6c2a1b..bdb06c5 100644 --- a/lib/android/examples/src/ui_test.nit +++ b/lib/android/examples/src/ui_test.nit @@ -16,9 +16,9 @@ # Test for app.nit's UI services module ui_test is - app_name("app.nit UI test") + app_name "app.nit UI test" app_version(0, 1, git_revision) - java_package("org.nitlanguage.ui_test") + app_namespace "org.nitlanguage.ui_test" android_manifest_activity """android:theme="@android:style/Theme.Light"""" end -- 1.7.9.5