Merge pull request #1494 from seanpaultaylor/next

Fixes #1466.

gameplay/android/AndroidManifest.xml

@@ -1,14 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.gameplay3d.gameplay"
-    android:versionCode="1"
-    android:versionName="2.0" >
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" 
+	package="org.gameplay3d.gameplay" 
+	android:versionCode="1" 
+	android:versionName="1.0">
 
-    <uses-sdk android:minSdkVersion="14" />
+    <uses-sdk android:minSdkVersion="15”/>
 
-    <application
-        android:icon="@drawable/ic_launcher"
-        android:label="@string/app_name" >
-    </application>
+    <application android:icon="@drawable/ic_launcher" android:label="@string/app_name" />
 
 </manifest>

samples/browser/android/AndroidManifest.xml

@@ -2,24 +2,19 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
         package="org.gameplay3d.sample_browser"
         android:versionCode="1"
-        android:versionName="2.0">
+        android:versionName="1.0">
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-        
-    <!-- This is the platform API where the app was introduced. -->
-    <uses-sdk android:minSdkVersion="14" />
+    <uses-sdk android:minSdkVersion="15" />
 	<uses-feature android:glEsVersion="0x00020000"/>
 
     <application android:icon="@drawable/icon" android:label="@string/app_name" android:hasCode="true">
 
-        <!-- Our activity is the built-in NativeActivity framework class.
-             This will take care of integrating with our NDK code. -->
         <activity android:name="android.app.NativeActivity"
                 android:label="@string/app_name"
                 android:configChanges="orientation|keyboardHidden"
 				android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
 				android:screenOrientation="landscape">
-            <!-- Tell NativeActivity the name of or .so -->
             <meta-data android:name="android.app.lib_name" android:value="sample-browser" />
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

samples/character/android/AndroidManifest.xml

@@ -2,24 +2,18 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
         package="org.gameplay3d.sample_character"
         android:versionCode="1"
-        android:versionName="2.0">
+        android:versionName="1.0">
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-        
-    <!-- This is the platform API where the game was introduced. -->
-    <uses-sdk android:minSdkVersion="14" />
+    <uses-sdk android:minSdkVersion="15"/>
 	<uses-feature android:glEsVersion="0x00020000"/>
 
     <application android:icon="@drawable/icon" android:label="@string/app_name" android:hasCode="true">
-
-        <!-- Our activity is the built-in NativeActivity framework class.
-             This will take care of integrating with our NDK code. -->
         <activity android:name="android.app.NativeActivity"
                   android:label="@string/app_name"
                   android:configChanges="orientation|keyboardHidden"
 				  android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
 				  android:screenOrientation="landscape">
-            <!-- Tell NativeActivity the name of or .so -->
             <meta-data android:name="android.app.lib_name" android:value="sample-character" />
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

samples/lua/android/AndroidManifest.xml

@@ -2,24 +2,19 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
         package="org.gameplay3d.sample_lua"
         android:versionCode="1"
-        android:versionName="2.0">
+        android:versionName="1.0">
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-        
-    <!-- This is the platform API where the app was introduced. -->
-    <uses-sdk android:minSdkVersion="14" />
+    <uses-sdk android:minSdkVersion="15" />
 	<uses-feature android:glEsVersion="0x00020000"/>
 
     <application android:icon="@drawable/icon" android:label="@string/app_name" android:hasCode="true">
 
-        <!-- Our activity is the built-in NativeActivity framework class.
-             This will take care of integrating with our NDK code. -->
         <activity android:name="android.app.NativeActivity"
                 android:label="@string/app_name"
                 android:configChanges="orientation|keyboardHidden"
 				android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
 				android:screenOrientation="landscape">
-            <!-- Tell NativeActivity the name of or .so -->
             <meta-data android:name="android.app.lib_name" android:value="sample-lua" />
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

samples/mesh/android/AndroidManifest.xml

@@ -2,24 +2,18 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
         package="org.gameplay3d.sample_mesh"
         android:versionCode="1"
-        android:versionName="2.0">
+        android:versionName="1.0">
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-        
-    <!-- This is the platform API where MeshGame was introduced. -->
-    <uses-sdk android:minSdkVersion="14" />
+    <uses-sdk android:minSdkVersion="15" />
 	<uses-feature android:glEsVersion="0x00020000"/>
 
     <application android:icon="@drawable/icon" android:label="@string/app_name" android:hasCode="true">
-
-        <!-- Our activity is the built-in NativeActivity framework class.
-             This will take care of integrating with our NDK code. -->
         <activity android:name="android.app.NativeActivity"
                   android:label="@string/app_name"
                   android:configChanges="orientation|keyboardHidden"
 				  android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
 				  android:screenOrientation="landscape">
-            <!-- Tell NativeActivity the name of or .so -->
             <meta-data android:name="android.app.lib_name" android:value="sample-mesh" />
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

samples/particles/android/AndroidManifest.xml

@@ -2,24 +2,18 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
         package="org.gameplay3d.sample_particles"
         android:versionCode="1"
-        android:versionName="2.0">
+        android:versionName="1.0">
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-        
-    <!-- This is the platform API where the app was introduced. -->
     <uses-sdk android:minSdkVersion="14" />
 	<uses-feature android:glEsVersion="0x00020000"/>
 
     <application android:icon="@drawable/icon" android:label="@string/app_name" android:hasCode="true">
-
-        <!-- Our activity is the built-in NativeActivity framework class.
-             This will take care of integrating with our NDK code. -->
         <activity android:name="android.app.NativeActivity"
                   android:label="@string/app_name"
                   android:configChanges="orientation|keyboardHidden"
 				  android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
 				  android:screenOrientation="landscape">
-            <!-- Tell NativeActivity the name of or .so -->
             <meta-data android:name="android.app.lib_name" android:value="sample-particles" />
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

samples/racer/android/AndroidManifest.xml

@@ -2,24 +2,18 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
         package="org.gameplay3d.sample_racer"
         android:versionCode="1"
-        android:versionName="2.0">
+        android:versionName="1.0">
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-        
-    <!-- This is the platform API where the app was introduced. -->
-    <uses-sdk android:minSdkVersion="14" />
+    <uses-sdk android:minSdkVersion="15" />
 	<uses-feature android:glEsVersion="0x00020000"/>
 
     <application android:icon="@drawable/icon" android:label="@string/app_name" android:hasCode="true">
-
-        <!-- Our activity is the built-in NativeActivity framework class.
-             This will take care of integrating with our NDK code. -->
         <activity android:name="android.app.NativeActivity"
                 android:label="@string/app_name"
                 android:configChanges="orientation|keyboardHidden"
 				android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
 				android:screenOrientation="landscape">
-            <!-- Tell NativeActivity the name of or .so -->
             <meta-data android:name="android.app.lib_name"
                     android:value="sample-racer" />
             <intent-filter>

samples/spaceship/android/AndroidManifest.xml

@@ -2,28 +2,18 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
         package="org.gameplay3d.sample_spaceship"
         android:versionCode="1"
-        android:versionName="2.0">
+        android:versionName="1.0">
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-        
-    <!-- This is the platform API where the game was introduced. -->
-    <uses-sdk android:minSdkVersion="14" />
+    <uses-sdk android:minSdkVersion="15" />
 	<uses-feature android:glEsVersion="0x00020000"/>
 
     <application android:icon="@drawable/icon" android:label="@string/app_name" android:hasCode="true">
-
-
-        <!--meta-data android:name="com.google.android.gms.games.APP_ID"
-            	   android:value="@string/app_id" /-->
-            
-        <!-- Our activity is the built-in NativeActivity framework class.
-             This will take care of integrating with our NDK code. -->
         <activity android:name="android.app.NativeActivity"
                   android:label="@string/app_name"
                   android:configChanges="orientation|keyboardHidden"
 				  android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
 				  android:screenOrientation="landscape">
-            <!-- Tell NativeActivity the name of or .so -->
             <meta-data android:name="android.app.lib_name" android:value="sample-spaceship"/>
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

template/android/template.AndroidManifest.xml

@@ -5,21 +5,16 @@
         android:versionName="1.0">
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-        
-    <!-- This is the platform API where the app was introduced. -->
-    <uses-sdk android:minSdkVersion="14" />
+    <uses-sdk android:minSdkVersion="15" />
 	<uses-feature android:glEsVersion="0x00020000"/>
 
     <application android:icon="@drawable/icon" android:label="@string/app_name" android:hasCode="true">
 
-        <!-- Our activity is the built-in NativeActivity framework class.
-             This will take care of integrating with our NDK code. -->
         <activity android:name="android.app.NativeActivity"
                 android:label="@string/app_name"
                 android:configChanges="orientation|keyboardHidden"
 				android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
 				android:screenOrientation="landscape">
-            <!-- Tell NativeActivity the name of or .so -->
             <meta-data android:name="android.app.lib_name"
                     android:value="TEMPLATE_PROJECT" />
             <intent-filter>