Merge pull request #1 from jMonkeyEngine/master

Pull from remote repository
revvv · Apr 2, 2020 · 600b339 · 600b339
2 parents aff34b9 + 577d53a
commit 600b339
Show file tree

Hide file tree

Showing 19 changed files with 937 additions and 851 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,5 +1,4 @@
 language: java
-sudo: false
 jdk: openjdk11
 dist: bionic
 
@@ -12,7 +11,7 @@ cache:
    - jdks/local/*/compiled
 
 addons:
-  ssh_known_hosts: updates.jmonkeyengine.org
+  #ssh_known_hosts: updates.jmonkeyengine.org
   apt:
     packages:
     - p7zip-full
@@ -66,6 +65,7 @@ before_deploy:
 
   # Force Freeing Space.
   - rm -rf build/
+  - ./gradlew overrideHarness # This will patch the launcher exes to have our custom icon
   - set -o pipefail # Allow failing in ant to be up-propagated
   - ant -Dstorepass="$NBM_SIGN_PASS" -Dpack200.enabled=true set-spec-version build-installers unset-spec-version | awk '{printf("."); fflush(stdout)}'
 

diff --git a/build.gradle b/build.gradle
@@ -106,7 +106,9 @@ dependencies {
     optlibs dep("org.jmonkeyengine:jme3-ios", false, false)
     optlibs dep("org.jmonkeyengine:jme3-android-native", false, false)
     optlibs dep("org.jmonkeyengine:jme3-bullet-native-android", false, false)
-    optlibs dep("com.github.stephengold:Minie:1.4.1for33", false, false)
+    optlibs dep("com.github.stephengold:Heart:5.0.0for33", false, false)
+    optlibs dep("com.github.stephengold:Minie:1.5.0for33", false, false)
+    optlibs dep("com.github.stephengold:Wes:0.4.8for33", false, false)
     testdatalibs dep("org.jmonkeyengine:jme3-testdata", false, false)
 
     examplelibs dep("org.jmonkeyengine:jme3-examples", false, false)
@@ -633,7 +635,7 @@ task downloadAvian() {
     }
 }
 
-task buildSdk(dependsOn: [copyBaseLibs, copyProjectLibs, createProjectXml, createBaseXml, copyTestSources, overrideHarness, downloadAvian]) {
+task buildSdk(dependsOn: [copyBaseLibs, copyProjectLibs, createProjectXml, createBaseXml, copyTestSources, downloadAvian]) {
     doLast {
         ant.propertyfile(file: "nbproject/project.properties") {
             entry( key: "plugins.version", value: "${jmeVersion}")

diff --git a/gradle.properties b/gradle.properties
@@ -14,5 +14,5 @@ buildJavaDoc = true
 buildSdkProject = true
 
 # Path for downloading NetBeans Base
-netbeansUrl = http://apache.org/dist/netbeans/netbeans/11.2/netbeans-11.2-bin.zip
+netbeansUrl = https://downloads.apache.org/netbeans/netbeans/11.3/netbeans-11.3-bin.zip
 # LTS: http://apache.org/dist/incubator/netbeans/incubating-netbeans/incubating-11.0/incubating-netbeans-11.0-bin.zip
diff --git a/harness-override/app.exe b/harness-override/app.exe
diff --git a/harness-override/app64.exe b/harness-override/app64.exe
diff --git a/harness-override/override.properties b/harness-override/override.properties
@@ -1,6 +1,6 @@
-app.exe.hashBefore=99fc52c36ef403064fe584efe29b93347d820b2bcff04ca9f05b011abb80f571
-app.exe.hashAfter=1190d095c6d16de54d331d64d3d504f13801a6b459cfc508ff2a4d6a991bfaba
-app64.exe.hashBefore=856a8949e5fc135927c30896de7d756b109670d8dbd8eac19b433439936c8dcc
-app64.exe.hashAfter=2d8cc3a0dcc0cd8825ac4bf23adf92ecf5089411e4d3703b1a93cf844c76ea02
+app.exe.hashBefore=cb062e75a53f65eccf904aea872675de5bd9929d698755897dd7df62185eca4d
+app.exe.hashAfter=891376025a56ea1ba1db2af5647e55dfb10a08f4575e78126de2857c686b3b6c
+app64.exe.hashBefore=79b32203242f46180bf786d589b53723bbccf0ef07b800932441cf03d47f1102
+app64.exe.hashAfter=ae90b815377d79174bee91f491317c3792863812be5d82fa3dae294c07a6e0eb
 pre7_app.exe.hashBefore=f4ea42a1ec2572b2a65a6d9baef0dd1f7293980c44c5d031c5b2ea5752352e49
 pre7_app.exe.hashAfter=fa8ae6457dad70a65cecb623ef0f60a86c92e856705eaeb2f22e43310fa9226f
diff --git a/jme3-ios/ios-data/templates/ios.properties b/jme3-ios/ios-data/templates/ios.properties
@@ -48,7 +48,17 @@ ios.proguard.options=-keep public class com.jme3.system.ios.*{public *;} \
 -keep public class * implements javax.xml.parsers.SAXParserFactory{public *;} \
 -keep public class com.sun.org.apache.xerces.internal.jaxp.SAXParserFactoryImpl \
 -keep public class com.sun.org.apache.xerces.internal.impl.dv.dtd.DTDDVFactoryImpl \
--keep public class sun.nio.fs.MacOSXFileSystemProvider
+-keep public class sun.nio.fs.MacOSXFileSystemProvider \
+-keep public class * extends java.nio.charset.Charset { *; } \
+-keep public class java.util.zip.Deflater { *; } \
+-keep public class java.io.FileNotFoundException { *; } \
+-keep public class java.lang.reflect.Proxy { *; } \
+-keep public class java.lang.reflect.InvocationHandler { *; } \
+-keep public class java.util.logging.ConsoleHandler \
+-keep public class java.util.logging.FileHandler \
+-keep public class java.util.logging.SimpleFormatter \
+-keep public class java.util.logging.LogManager { *; } \
+-keep public class org.xmlpull.mxp1.MXParserFactory { *; }
 
 # native compile
 ios.cc.source.dir=ios/src
@@ -57,7 +67,7 @@ ios.cc.compiler=clang
 ios.cc.cflags=-D__IPHONE_OS_VERSION_MIN_REQUIRED=30202 \
 -fobjc-abi-version=2 -fobjc-legacy-dispatch \
 -I/System/Library/Frameworks/JavaVM.framework/Headers \
--I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/System/Library/Frameworks/JavaVM.framework/Headers/
+-I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/JavaVM.framework/Headers/
 
 # arm/i386 section, resolved in build file to ios.avian.bootimage-generator etc.
 ios.avian.path.arm=${ios.avian.path}/avian-arm

diff --git a/jme3-ios/ios-data/templates/project/jme-ios.xcodeproj/project.pbxproj b/jme3-ios/ios-data/templates/project/jme-ios.xcodeproj/project.pbxproj
@@ -163,7 +163,8 @@
 		08914BFB142A826B00991C80 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				ORGANIZATIONNAME = "ECOVATE INC, d.b.a. ReadyTalk";
+				LastUpgradeCheck = 1130;
+				ORGANIZATIONNAME = jmonkeyengine.org;
 				TargetAttributes = {
 					08914C03142A826B00991C80 = {
 						DevelopmentTeam = X9TVYA7QX5;
@@ -175,6 +176,7 @@
 			developmentRegion = English;
 			hasScannedForEncodings = 0;
 			knownRegions = (
+				English,
 				en,
 			);
 			mainGroup = 08914BF9142A826B00991C80;
@@ -247,119 +249,195 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_TESTABILITY = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"DEBUG=1",
 					"$(inherited)",
 				);
 				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
 				GCC_VERSION = "";
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES;
+				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				HEADER_SEARCH_PATHS = (
 					/System/Library/Frameworks/JavaVM.framework/Headers,
-					/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/System/Library/Frameworks/JavaVM.framework/Headers/,
+					/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/JavaVM.framework/Headers/,
 				);
-				IPHONEOS_DEPLOYMENT_TARGET = 5.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = (
 					"-filelist",
 					"../../build/ios-arm/libs.list",
 					"-filelist",
 					"../../build/ios-arm64/libs.list",
 					"-filelist",
-					"../../build/ios-i386/libs.list",
+					"../../build/ios-x86_64/libs.list",
 					"-lz",
 					"-rdynamic",
+					"-force_cpusubtype_ALL",
 				);
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
+				VALID_ARCHS = "armv7 arm64 x86_64";
 			};
 			name = Debug;
 		};
 		08914C29142A826B00991C80 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = YES;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_VERSION = "";
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES;
+				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				HEADER_SEARCH_PATHS = (
 					/System/Library/Frameworks/JavaVM.framework/Headers,
-					/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/System/Library/Frameworks/JavaVM.framework/Headers/,
+					/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/JavaVM.framework/Headers/,
 				);
-				IPHONEOS_DEPLOYMENT_TARGET = 5.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1";
 				OTHER_LDFLAGS = (
 					"-filelist",
 					"../../build/ios-arm/libs.list",
 					"-filelist",
 					"../../build/ios-arm64/libs.list",
 					"-filelist",
-					"../../build/ios-i386/libs.list",
+					"../../build/ios-x86_64/libs.list",
 					"-lz",
 					"-rdynamic",
+					"-force_cpusubtype_ALL",
 				);
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VALIDATE_PRODUCT = YES;
+				VALID_ARCHS = "armv7 arm64 x86_64";
 			};
 			name = Release;
 		};
 		08914C2B142A826B00991C80 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = (
-					armv7,
-					i386,
-				);
+				CLANG_ENABLE_OBJC_WEAK = YES;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				DEVELOPMENT_TEAM = X9TVYA7QX5;
+				ENABLE_BITCODE = NO;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "jme-ios/jme-ios-Prefix.pch";
 				GCC_VERSION = "";
 				HEADER_SEARCH_PATHS = (
 					/System/Library/Frameworks/JavaVM.framework/Headers,
-					/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/System/Library/Frameworks/JavaVM.framework/Headers/,
+					/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/JavaVM.framework/Headers/,
 				);
 				INFOPLIST_FILE = "jme-ios/jme-ios-Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 5.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				OTHER_LDFLAGS = (
+					"-filelist",
+					"../../build/ios-arm/libs.list",
+					"-filelist",
+					"../../build/ios-arm64/libs.list",
+					"-filelist",
+					"../../build/ios-x86_64/libs.list",
+					"-lz",
+					"-rdynamic",
+					"-force_cpusubtype_ALL",
+				);
+				PRODUCT_BUNDLE_IDENTIFIER = "com.jmonkeyengine.jme-ios";
 				PRODUCT_NAME = "jme-ios";
 				PROVISIONING_PROFILE = "";
+				VALID_ARCHS = "armv7 arm64 x86_64";
 				WRAPPER_EXTENSION = app;
 			};
 			name = Debug;
 		};
 		08914C2C142A826B00991C80 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = (
-					armv7,
-					i386,
-				);
+				CLANG_ENABLE_OBJC_WEAK = YES;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				DEVELOPMENT_TEAM = X9TVYA7QX5;
+				ENABLE_BITCODE = NO;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "jme-ios/jme-ios-Prefix.pch";
 				GCC_VERSION = "";
 				HEADER_SEARCH_PATHS = (
 					/System/Library/Frameworks/JavaVM.framework/Headers,
-					/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/System/Library/Frameworks/JavaVM.framework/Headers/,
+					/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/JavaVM.framework/Headers/,
 				);
 				INFOPLIST_FILE = "jme-ios/jme-ios-Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 5.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				OTHER_LDFLAGS = (
+					"-filelist",
+					"../../build/ios-arm/libs.list",
+					"-filelist",
+					"../../build/ios-arm64/libs.list",
+					"-filelist",
+					"../../build/ios-x86_64/libs.list",
+					"-lz",
+					"-rdynamic",
+					"-force_cpusubtype_ALL",
+				);
+				PRODUCT_BUNDLE_IDENTIFIER = "com.jmonkeyengine.jme-ios";
 				PRODUCT_NAME = "jme-ios";
 				PROVISIONING_PROFILE = "";
+				VALID_ARCHS = "armv7 arm64 x86_64";
 				WRAPPER_EXTENSION = app;
 			};
 			name = Release;

diff --git a/jme3-ios/ios-data/templates/project/jme-ios/jme-ios-Info.plist b/jme3-ios/ios-data/templates/project/jme-ios/jme-ios-Info.plist
@@ -11,7 +11,7 @@
 	<key>CFBundleIconFile</key>
 	<string></string>
 	<key>CFBundleIdentifier</key>
-	<string>com.jmonkeyengine.${PRODUCT_NAME:rfc1034identifier}</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
@@ -30,6 +30,8 @@
 	<string>MainWindow_iPhone</string>
 	<key>NSMainNibFile~ipad</key>
 	<string>MainWindow_iPad</string>
+	<key>UIStatusBarHidden</key>
+	<true/>
 	<key>UISupportedInterfaceOrientations</key>
 	<array>
 		<string>UIInterfaceOrientationPortrait</string>
@@ -43,5 +45,7 @@
 		<string>UIInterfaceOrientationLandscapeLeft</string>
 		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
+	<key>UIViewControllerBasedStatusBarAppearance</key>
+	<false/>
 </dict>
 </plist>