aboutsummaryrefslogtreecommitdiff
path: root/src/junit/runner/Version.java
diff options
context:
space:
mode:
authorPaul Duffin <paulduffin@google.com>2016-12-12 13:07:26 +0000
committerPaul Duffin <paulduffin@google.com>2016-12-13 10:56:35 +0000
commit918ac8dcd87c54e5f13457b9eb53127b5c5f9cdb (patch)
treea85cba2753a2dbcf1d87b785735aac7588513b59 /src/junit/runner/Version.java
parent3a86064f04f2933102d7cb0e17165c3b76303c1a (diff)
downloadjunit-918ac8dcd87c54e5f13457b9eb53127b5c5f9cdb.tar.gz
Remove junit-runner and revert files to standard JUnit 4.10
Removes the junit-runner target as it is no longer used, the junit-runner-files variable and removes any Android specific patches needed to maintain backwards compatibility with the Android API. That includes the removal of TestSuiteLoader and StandardTestSuiteLoader as they are not part of JUnit 4.10 and only kept to maintain compatibility with the Android API. This will not affect the Android API as that is now generated from copies of the files in frameworks/base/test-runner/src/. Bug: 30188076 Test: make checkbuild Change-Id: I53c138cdd8b33a5b9ec1e8c16f3dde637762c0fc
Diffstat (limited to 'src/junit/runner/Version.java')
-rw-r--r--src/junit/runner/Version.java6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/junit/runner/Version.java b/src/junit/runner/Version.java
index dd88c03..21aabfa 100644
--- a/src/junit/runner/Version.java
+++ b/src/junit/runner/Version.java
@@ -9,11 +9,9 @@ public class Version {
}
public static String id() {
- return "4.10";
+ return "4.10-SNAPSHOT";
}
-
- // android-changed
- /** @hide - not needed for public API */
+
public static void main(String[] args) {
System.out.println(id());
}