Skip to content

Commit

Permalink
Merge pull request #149 from jjelliott/master
Browse files Browse the repository at this point in the history
Fix SSL error
  • Loading branch information
SpiritQuaddicted committed Apr 14, 2024
2 parents 34195c1 + a8b94bb commit 65fe592
Show file tree
Hide file tree
Showing 5 changed files with 4 additions and 3,951 deletions.
6 changes: 2 additions & 4 deletions build.gradle
Expand Up @@ -7,8 +7,6 @@ plugins {
id 'edu.sc.seis.launch4j' version '2.5.0'
}

sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
version = "git describe --tags".execute().text.trim()
repositories {
mavenCentral()
Expand Down Expand Up @@ -59,7 +57,7 @@ task downloadJre {
def f = new File("$buildDir/jre.zip")
f.parentFile.mkdir()
if (!f.exists()) {
new URL('https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10_openj9-0.26.0/OpenJDK8U-jre_x86-32_windows_openj9_8u292b10_openj9-0.26.0.zip').withInputStream {i -> f.withOutputStream {it << i}}
new URL('https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.10%2B7/OpenJDK17U-jdk_x86-32_windows_hotspot_17.0.10_7.zip').withInputStream {i -> f.withOutputStream {it << i}}
}

copy {
Expand All @@ -79,7 +77,7 @@ task setupWinDist(type: Copy) {
doLast {
copy {
file("$buildDir/jre").eachDir {
if (it.name.contains("jre")) {
if (it.name.contains("jdk")) {
jreDir = it
}
}
Expand Down
3 changes: 2 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
#Fri Apr 12 17:48:37 EDT 2024
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
74 changes: 0 additions & 74 deletions src/main/java/de/haukerehfeld/quakeinjector/CABundleLoader.java

This file was deleted.

Expand Up @@ -909,12 +909,6 @@ public boolean enginePathNotSetDialogue() {


public static void main(String[] args) {
try {
CABundleLoader.loadCertificateAuthorities();
} catch (Exception e) {
e.printStackTrace();
}

try {
// Set System L&F
javax.swing.UIManager.setLookAndFeel(
Expand Down

0 comments on commit 65fe592

Please sign in to comment.