Skip to content

Commit

Permalink
Native window behavior and design brush-up (FAForever#1818)
Browse files Browse the repository at this point in the history
Fixes FAForever#1007
Fixes FAForever#1033
Fixes FAForever#1038
Fixes FAForever#1075
Fixes FAForever#1685
Fixes FAForever#1751
Fixes FAForever#1760
Fixes FAForever#1766
Fixes FAForever#1815
Fixes FAForever#1816
Fixes FAForever#1817
Fixes FAForever#1821

Co-authored-by: alexander <alexander.von.trostorff@gmail.com>
Co-authored-by: Sheikah45 <Sheikah450@gmail.com>
  • Loading branch information
3 people authored and Chris Haggan committed Apr 15, 2022
1 parent b775756 commit 86986f5
Show file tree
Hide file tree
Showing 154 changed files with 4,663 additions and 4,689 deletions.
4 changes: 4 additions & 0 deletions .idea/encodings.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 4 additions & 1 deletion .idea/runConfigurations/Main.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 6 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ env:
- secure: "UVIbeoJpx9n0KSWHbpdWZuR4zeZfXw3JQBq2Zb1h0/j4uREfXWiGFuNVQBPjsdtYi2+LkecjJ/MgKWo+SS0SjsvTa/ZPkOXt4408H1qYgwVnvWoeL/g1QQ6T8ADNysl/4ZtJLnSp0WXYEBkfHYZJD++vgDwkpVhnCLVzSFVAHls="

before_install:
- export JDK="openjdk11"
- export JDK="openjdk14"
#Installs the normal openjdk as this is not supported by travis itself
- chmod +x ./ci/installjdk.sh && sudo ./ci/installjdk.sh
- chmod +x ./ci/installjdk.sh && ./ci/installjdk.sh
- export JAVA_HOME="~/$JDK"
- export JAVA_TOOL_OPTIONS="-Dprism.verbose=true -Dprism.order=sw -Djava.library.path=$HOME/openjfx/javafx-sdk-11/lib"
- export JAVA_TOOL_OPTIONS="-Dprism.verbose=true -Dprism.order=sw"
- export JAVA_TOOL_OPTIONS="-Dprism.verbose=true -Dprism.order=sw"
- export APP_VERSION=$([ -n "${TRAVIS_TAG}" ] && echo "${TRAVIS_TAG#*v}" || echo "${TRAVIS_BRANCH##*/}")
- export GITHUB_RELEASE_VERSION=$([ -n "${TRAVIS_TAG}" ] && echo "${TRAVIS_TAG}" || echo "${TRAVIS_BRANCH##*/}")
Expand Down Expand Up @@ -44,6 +44,7 @@ deploy:
file_glob: true
file:
- build/install4j/*.exe
- build/install4j/*.msi
- build/install4j/*.zip
- build/install4j/*.gz
- build/install4j/*.deb
Expand Down Expand Up @@ -83,5 +84,6 @@ cache:
- $HOME/install4j/
- $HOME/.gradle/caches/
- $HOME/.gradle/wrapper/
- ~/.install4j8
- /home/travis/build/FAForever/downlords-faf-client/build/cache/
- ~/openjdk11
- ~/openjdk14
14 changes: 9 additions & 5 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ apply plugin: 'propdeps'
apply plugin: 'distribution'


sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
sourceCompatibility = JavaVersion.VERSION_14
targetCompatibility = JavaVersion.VERSION_14

// These are read from gradle.properties
version "${version}"
Expand Down Expand Up @@ -237,7 +237,6 @@ task sendCoverageToCodacy(type: JavaExec, dependsOn: jacocoTestReport) {
}

repositories {
mavenCentral()
jcenter()
maven { url "https://jitpack.io" }
maven { url 'https://maven.ej-technologies.com/repository' }
Expand Down Expand Up @@ -284,7 +283,8 @@ dependencies {
compile("javax.annotation:javax.annotation-api:1.3.1")
compile("com.github.ben-manes.caffeine:caffeine")
compile("org.apache.httpcomponents:httpclient")
compile("com.github.micheljung:FX-BorderlessScene:3.5.0")
compile("ch.micheljung.fxstage:fxstage:0.7.3")
compile("ch.micheljung.waitomo:jfx-waitomo-theme:0.2.0")

compile("org.openjfx:javafx-base:${javafxVersion}:${javafxPlatform}")
compile("org.openjfx:javafx-controls:${javafxVersion}:${javafxPlatform}")
Expand All @@ -300,7 +300,7 @@ dependencies {

provided("com.install4j:install4j-runtime:${install4jRuntimeVersion}")

testCompile 'junit:junit:4.11'
testCompile 'junit:junit:4.13'
testCompile("org.testfx:testfx-core:4.0.8-alpha") {
exclude module: 'guava'
}
Expand All @@ -312,3 +312,7 @@ dependencies {

codacy("com.github.codacy:codacy-coverage-reporter:-SNAPSHOT")
}

task downloadWebViewPatch{

}
12 changes: 6 additions & 6 deletions ci/github-release.sh
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
#!/usr/bin/env bash

# Download install4j and the required JRE, only if it doesn't already exist (from Travis cache)
INSTALL4J_DIR="$HOME/install4j/install4j7.0.12"
if [ ! -d "${INSTALL4J_DIR}" ] || [ ! -d "${INSTALL4J_DIR}/jres/windows-amd64-11.0.7_packed.tar.gz" ]; then
INSTALL4J_DIR="$HOME/install4j/install4j8.0.8"
if [ ! -d "${INSTALL4J_DIR}" ] || [ ! -d "$HOME/.install4j8/jres/windows-amd64-14.0.2.tar.gz" ]; then
rm -rf "$HOME/install4j"
mkdir -p "$HOME/install4j"
curl https://download-gcdn.ej-technologies.com/install4j/install4j_unix_7_0_12.tar.gz -o "$HOME/install4j/install4j.tar.gz"
mkdir -p "${INSTALL4J_DIR}/jres/"
curl https://content.faforever.com/jre/windows-amd64-11.0.7.tar.gz -o "${INSTALL4J_DIR}/jres/windows-amd64-11.0.7_packed.tar.gz"
tar xzf "$HOME/install4j/install4j.tar.gz" -C "$HOME/install4j"
curl https://download-gcdn.ej-technologies.com/install4j/install4j_unix_8_0_8.tar.gz -o "$HOME/install4j/install4j8.tar.gz"
mkdir -p "$HOME/.install4j8/jres/"
curl https://content.faforever.com/jre/windows-amd64-14.0.2.tar.gz -o "$HOME/.install4j8/jres/windows-amd64-14.0.2.tar.gz"
tar xzf "$HOME/install4j/install4j8.tar.gz" -C "$HOME/install4j"
fi

./gradlew -Pversion=${APP_VERSION} \
Expand Down
2 changes: 1 addition & 1 deletion ci/installjdk.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ wget "$url" -P ~/bin/ || {
}
chmod +x ~/bin/install-jdk.sh
export JAVA_HOME="~/$JDK"
~/bin/install-jdk.sh --url "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7%2B10/OpenJDK11U-jdk_x64_linux_hotspot_11.0.7_10.tar.gz" --target "$JAVA_HOME" --workspace "$TRAVIS_HOME/.cache/install-jdk" --cacerts
~/bin/install-jdk.sh --url "https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk-14%2B36/OpenJDK14U-jdk_x64_linux_hotspot_14_36.tar.gz" --target "$JAVA_HOME" --workspace "$TRAVIS_HOME/.cache/install-jdk" --cacerts

0 comments on commit 86986f5

Please sign in to comment.