From 6892a428fa4a8fc8b3994e05458104a48d3c9ed1 Mon Sep 17 00:00:00 2001 From: Mats Wichmann Date: Wed, 1 Aug 2018 13:41:30 -0600 Subject: Fix conflict on java-version patch due to dropped character --- src/engine/SCons/Tool/JavaCommon.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/engine/SCons/Tool/JavaCommon.py b/src/engine/SCons/Tool/JavaCommon.py index 5f54605..47555a7 100644 --- a/src/engine/SCons/Tool/JavaCommon.py +++ b/src/engine/SCons/Tool/JavaCommon.py @@ -64,7 +64,7 @@ if java_parsing: interfaces, and anonymous inner classes.""" def __init__(self, version=default_java_version): - if not version in ('1.1', '1.2', '1.3','1.4', '1.5', '1.6', '1.7', + if not version in ('1.1', '1.2', '1.3', '1.4', '1.5', '1.6', '1.7', '1.8', '5', '6', '9.0', '10.0'): msg = "Java version %s not supported" % version raise NotImplementedError(msg) -- cgit v0.12