examples: remove annotations used to avoid bug in mnit_simple

Signed-off-by: Alexis Laferrière <alexis.laf@xymus.net>

diff --git a/examples/mnit_simple/src/complete_simple_android.nit b/examples/mnit_simple/src/complete_simple_android.nit
index 57eead6..9ee8b06 100644 (file)
--- a/examples/mnit_simple/src/complete_simple_android.nit
+++ b/examples/mnit_simple/src/complete_simple_android.nit
@@ -1,8 +1,21 @@
-#FIXME: Improper way of resolving unjustified metadata conflict
+# This file is part of NIT ( http://www.nitlanguage.org ).
+#
+# Copyright 2014 Frédéric Vachon <fredvac@gmail.com>
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 module complete_simple_android is
-    app_name("test all")
        java_package("org.nitlanguage.test_all")
-       app_version(1, 0)
 end
 
 import test_bundle

diff --git a/examples/mnit_simple/src/simple.nit b/examples/mnit_simple/src/simple.nit
index dd6f65d..6bfc9b1 100644 (file)
--- a/examples/mnit_simple/src/simple.nit
+++ b/examples/mnit_simple/src/simple.nit
@@ -16,7 +16,7 @@
 
 # Very simple application
 module simple is
-       app_name("mnit Simple example")
+       app_name("mnit Simple example") # On Android, this name is hidden by the value in `res/values/strings.xml`
        app_version(0, 2, git_revision)
 end
 

diff --git a/examples/mnit_simple/src/simple_android.nit b/examples/mnit_simple/src/simple_android.nit
index d92ecc6..833d832 100644 (file)
--- a/examples/mnit_simple/src/simple_android.nit
+++ b/examples/mnit_simple/src/simple_android.nit
@@ -15,7 +15,6 @@
 # limitations under the License.
 
 module simple_android is
-       java_package("org.nitlanguage.simple")
        android_manifest("""<uses-permission android:name="android.permission.VIBRATE" />""")
 end