fix hello-jni and hello-world-gradle-layout tests

scala-android · Aug 12, 2016 · a82fe97 · a82fe97
1 parent 7117f79
commit a82fe97
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 12 deletions.
diff --git a/sbt-test/android-sdk-plugin/hello-jni/build.sbt b/sbt-test/android-sdk-plugin/hello-jni/build.sbt
@@ -1 +1,3 @@
-showSdkProgress in Android := false
+showSdkProgress in Android := false
+
+javacOptions in Compile ++= "-source" :: "1.7" :: "-target" :: "1.7" :: Nil
diff --git a/sbt-test/android-sdk-plugin/hello-jni/tests/AndroidManifest.xml b/sbt-test/android-sdk-plugin/hello-jni/tests/AndroidManifest.xml
@@ -10,12 +10,4 @@
     <application>
         <uses-library android:name="android.test.runner" />
     </application>
-    <!--
-    This declares that this application uses the instrumentation test runner targeting
-    the package of com.example.hellojni.  To run the tests use the command:
-    "adb shell am instrument -w com.example.hellojni.tests/android.test.InstrumentationTestRunner"
-    -->
-    <instrumentation android:name="android.test.InstrumentationTestRunner"
-                     android:targetPackage="com.example.hellojni"
-                     android:label="Tests for HelloJni"/>
 </manifest>
diff --git a/...ut/src/instrumentTest/AndroidManifest.xml → ...ayout/src/androidTest/AndroidManifest.xml b/...ut/src/instrumentTest/AndroidManifest.xml → ...ayout/src/androidTest/AndroidManifest.xml
@@ -7,7 +7,4 @@
         <uses-sdk android:minSdkVersion="3"/>
         <uses-library android:name="android.test.runner"/>
     </application>
-    <instrumentation
-            android:label="Tests for Example App"
-            android:name="android.test.InstrumentationTestRunner"/>
 </manifest> 
diff --git a/...umentTest/com/example/app/SimpleTest.java → ...droidTest/com/example/app/SimpleTest.java b/...umentTest/com/example/app/SimpleTest.java → ...droidTest/com/example/app/SimpleTest.java