diff options
| author | Petr Mrázek <peterix@users.noreply.github.com> | 2021-12-19 18:42:29 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-19 18:42:29 +0100 |
| commit | 5961c69019faad7d43b69942669d51221030a468 (patch) | |
| tree | dfb237c3545bec4d92d651767da69054171040cf | |
| parent | 526b322a4aaabd1951550b5281bed7685188ab1f (diff) | |
| parent | c29b6164974f5608966259eeb05c9308b861f8d1 (diff) | |
| download | PrismLauncher-5961c69019faad7d43b69942669d51221030a468.tar.gz PrismLauncher-5961c69019faad7d43b69942669d51221030a468.tar.bz2 PrismLauncher-5961c69019faad7d43b69942669d51221030a468.zip | |
Merge pull request #4321 from davispuh/java
Update Java version to 7+
| -rw-r--r-- | libraries/javacheck/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | libraries/launcher/CMakeLists.txt | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/libraries/javacheck/CMakeLists.txt b/libraries/javacheck/CMakeLists.txt index dba5a1ae..73b4b5c6 100644 --- a/libraries/javacheck/CMakeLists.txt +++ b/libraries/javacheck/CMakeLists.txt @@ -1,10 +1,10 @@ cmake_minimum_required(VERSION 3.1) project(launcher Java) -find_package(Java 1.6 REQUIRED COMPONENTS Development) +find_package(Java 7 REQUIRED COMPONENTS Development) include(UseJava) set(CMAKE_JAVA_JAR_ENTRY_POINT JavaCheck) -set(CMAKE_JAVA_COMPILE_FLAGS -target 1.6 -source 1.6 -Xlint:deprecation -Xlint:unchecked) +set(CMAKE_JAVA_COMPILE_FLAGS -target 7 -source 7 -Xlint:deprecation -Xlint:unchecked) set(SRC JavaCheck.java diff --git a/libraries/launcher/CMakeLists.txt b/libraries/launcher/CMakeLists.txt index a64c601d..4db80de2 100644 --- a/libraries/launcher/CMakeLists.txt +++ b/libraries/launcher/CMakeLists.txt @@ -1,10 +1,10 @@ cmake_minimum_required(VERSION 3.1) project(launcher Java) -find_package(Java 1.6 REQUIRED COMPONENTS Development) +find_package(Java 7 REQUIRED COMPONENTS Development) include(UseJava) set(CMAKE_JAVA_JAR_ENTRY_POINT org.multimc.EntryPoint) -set(CMAKE_JAVA_COMPILE_FLAGS -target 1.6 -source 1.6 -Xlint:deprecation -Xlint:unchecked) +set(CMAKE_JAVA_COMPILE_FLAGS -target 7 -source 7 -Xlint:deprecation -Xlint:unchecked) set(SRC org/multimc/EntryPoint.java |