Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Drop support for Java 1.7 #1435

Merged
merged 1 commit into from
Jul 14, 2024
Merged

Drop support for Java 1.7 #1435

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ Minimum Required JDK

`Java-WebSocket` is known to work with:

* Java 1.7 and higher
* Java 8 and higher

Other JRE implementations may work as well, but haven't been tested.

Expand Down
13 changes: 6 additions & 7 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ repositories {
}

group = 'org.java-websocket'
version = '1.5.8-SNAPSHOT'
sourceCompatibility = 1.7
targetCompatibility = 1.7
version = '1.6.0-SNAPSHOT'
sourceCompatibility = 1.8
targetCompatibility = 1.8

compileJava {
options.compilerArgs += ['-encoding', 'UTF-8']
Expand All @@ -35,8 +35,7 @@ publishing {
}

dependencies {
implementation group: 'org.slf4j', name: 'slf4j-api', version: '2.0.6'
testImplementation group: 'org.slf4j', name: 'slf4j-simple', version: '2.0.6'
testImplementation group: 'junit', name: 'junit', version: '4.12'
testImplementation group: 'org.json', name: 'json', version: '20180813'
implementation group: 'org.slf4j', name: 'slf4j-api', version: '2.0.13'
testImplementation group: 'org.slf4j', name: 'slf4j-simple', version: '2.0.13'
testImplementation group: 'junit', name: 'junit', version: '4.13.1'
}
18 changes: 3 additions & 15 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,16 @@
<groupId>org.java-websocket</groupId>
<artifactId>Java-WebSocket</artifactId>
<packaging>jar</packaging>
<version>1.5.8-SNAPSHOT</version>
<version>1.6.0-SNAPSHOT</version>
<name>Java-WebSocket</name>
<description>A barebones WebSocket client and server implementation written 100% in Java</description>
<url>https://github.com/TooTallNate/Java-WebSocket</url>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<slf4j.version>2.0.6</slf4j.version>
<slf4j.version>2.0.13</slf4j.version>

<!-- Test dependencies versions -->
<junit.version>4.12</junit.version>
<org.json.version>20180813</org.json.version>
<junit.version>4.13.1</junit.version>

<!-- Maven plugin versions -->
<bnd.maven.plugin.version>6.4.0</bnd.maven.plugin.version>
Expand Down Expand Up @@ -63,12 +62,6 @@
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
<version>${org.json.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
</dependencyManagement>
<build>
Expand Down Expand Up @@ -299,11 +292,6 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
<developers>
<developer>
Expand Down
Loading
Loading