Skip to content

Commit

Permalink
Use maven central coordinates for fx2j plugin and api
Browse files Browse the repository at this point in the history
  • Loading branch information
Sheikah45 committed Nov 16, 2023
1 parent 135fec8 commit 51d8c40
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 29 deletions.
28 changes: 10 additions & 18 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,27 +1,18 @@
import com.install4j.gradle.Install4jTask
import org.gradle.internal.os.OperatingSystem

buildscript {
repositories {
mavenCentral()
}
dependencies {
classpath files('../fx2j/gradle-plugin/build/libs/fx2j-gradle-plugin-unspecified.jar')
}
}

plugins {
id 'org.springframework.boot' version '3.1.5'
id "com.install4j.gradle" version "10.0.6"
id "de.undercouch.download" version "5.5.0"
id 'jacoco'
id 'java'
id 'distribution'
id "me.champeau.jmh" version "0.7.1"
id("org.springframework.boot") version "3.1.5"
id("com.install4j.gradle") version "10.0.6"
id("de.undercouch.download") version "5.5.0"
id("jacoco")
id("java")
id("distribution")
id("me.champeau.jmh") version "0.7.1"
id("io.github.sheikah45.fx2j") version "0.0.0"
}

apply plugin: 'io.spring.dependency-management'
apply plugin: 'io.github.sheikah45.fx2j'

// source: https://github.com/mendhak/Gradle-Travis-Colored-Output/blob/master/ColoredOutput.gradle
tasks.withType(Test).configureEach {
Expand Down Expand Up @@ -215,6 +206,7 @@ install4j {
}

fx2j {
modularizeIfPossible = false
basePackage = "com.faforever.client.fx2j"
}

Expand Down Expand Up @@ -354,7 +346,7 @@ dependencies {

implementation("org.javassist:javassist:3.29.2-GA")

implementation(files("../fx2j/api/build/libs/fx2j-api-unspecified.jar"))
implementation("io.github.sheikah45.fx2j:fx2j-api:0.0.0")
implementation("com.install4j:install4j-runtime:10.0.6")

testImplementation("com.squareup.okhttp3:okhttp")
Expand Down
11 changes: 0 additions & 11 deletions src/main/java/com/faforever/client/config/ClientProperties.java
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@
import com.faforever.client.update.ClientConfiguration.UrlEndpoint;
import lombok.Data;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.web.reactive.socket.WebSocketHandler;
import org.springframework.web.reactive.socket.WebSocketSession;
import reactor.core.publisher.Mono;

import java.net.URI;
import java.time.Duration;
Expand Down Expand Up @@ -162,14 +159,6 @@ public void updateFromEndpoint(ServerEndpoints serverEndpoints) {
this.user.setBaseUrl(user.getUrl());
}

new WebSocketHandler() {

@Override
public Mono<Void> handle(WebSocketSession session) {
return session.receive().map(message -> message.);
}
}

SocketEndpoint liveReplay = serverEndpoints.getLiveReplay();
if (liveReplay != null) {
replay.setRemoteHost(liveReplay.getHost());
Expand Down

0 comments on commit 51d8c40

Please sign in to comment.