Skip to content

Commit

Permalink
version bump
Browse files Browse the repository at this point in the history
  • Loading branch information
@dev-claw
dev-claw committed Feb 22, 2024
1 parent d1c8a65 commit 6d9aa4c
Show file tree
Hide file tree
Showing 10 changed files with 89 additions and 80 deletions.
94 changes: 45 additions & 49 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,30 @@
<version>${revision}</version>
<properties>
<java.version>21</java.version>
<kotlin.version>1.9.22</kotlin.version>
<maven.deploy.skip>false</maven.deploy.skip>
<timestamp>${maven.build.timestamp}</timestamp>
<maven.build.timestamp.format>yyyy-MM-dd HH:mm:ss</maven.build.timestamp.format>
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<revision>5.2.0</revision>
<revision>5.3.0</revision>
<kotlin.version>1.9.22</kotlin.version>
<slf4j.version>2.0.12</slf4j.version>
<logback.version>1.5.0</logback.version>
<kotlinx-coroutines.version>1.8.0</kotlinx-coroutines.version>
<exposed.version>0.47.0</exposed.version>
<snakeyaml.version>2.0</snakeyaml.version>
<koin.version>3.5.3</koin.version>
<h2.version>2.2.224</h2.version>
<htmlcleaner.version>2.29</htmlcleaner.version>
<failsafe.version>2.4.4</failsafe.version>
<caffeine.version>3.1.8</caffeine.version>
<jna-platform.version>5.14.0</jna-platform.version>
<kotlinx-serialization-json.version>1.6.2</kotlinx-serialization-json.version>
<httpclient5.version>5.3.1</httpclient5.version>
<commons-codec.version>1.16.1</commons-codec.version>
<liquibase-core.version>4.26.0</liquibase-core.version>
<liquibase-slf4j.version>5.0.0</liquibase-slf4j.version>
</properties>
<build>
<plugins>
Expand Down Expand Up @@ -55,10 +71,20 @@
</modules>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>${slf4j.version}</version>
</dependency>
<dependency>
<artifactId>logback-classic</artifactId>
<groupId>ch.qos.logback</groupId>
<version>1.4.12</version>
<version>${logback.version}</version>
</dependency>
<dependency>
<artifactId>logback-core</artifactId>
<groupId>ch.qos.logback</groupId>
<version>${logback.version}</version>
</dependency>
<dependency>
<artifactId>kotlin-stdlib</artifactId>
Expand All @@ -68,82 +94,52 @@
<dependency>
<groupId>org.jetbrains.kotlinx</groupId>
<artifactId>kotlinx-coroutines-core-jvm</artifactId>
<version>1.7.3</version>
<version>${kotlinx-coroutines.version}</version>
</dependency>
<dependency>
<groupId>org.jetbrains.exposed</groupId>
<artifactId>exposed-jdbc</artifactId>
<version>0.41.1</version>
<version>${exposed.version}</version>
</dependency>
<dependency>
<groupId>org.jetbrains.exposed</groupId>
<artifactId>exposed-java-time</artifactId>
<version>0.41.1</version>
<version>${exposed.version}</version>
</dependency>
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
<version>2.0</version>
</dependency>
<dependency>
<groupId>io.projectreactor</groupId>
<artifactId>reactor-core</artifactId>
<version>3.5.10</version>
<version>${snakeyaml.version}</version>
</dependency>
<dependency>
<groupId>io.insert-koin</groupId>
<artifactId>koin-core-jvm</artifactId>
<version>3.4.2</version>
</dependency>
<dependency>
<artifactId>jackson-module-kotlin</artifactId>
<groupId>com.fasterxml.jackson.module</groupId>
<version>2.15.2</version>
<version>${koin.version}</version>
</dependency>
<dependency>
<artifactId>h2</artifactId>
<groupId>com.h2database</groupId>
<version>2.2.224</version>
</dependency>
<dependency>
<artifactId>httpclient</artifactId>
<groupId>org.apache.httpcomponents</groupId>
<version>4.5.14</version>
<version>${h2.version}</version>
</dependency>
<dependency>
<artifactId>htmlcleaner</artifactId>
<groupId>net.sourceforge.htmlcleaner</groupId>
<version>2.26</version>
<version>${htmlcleaner.version}</version>
</dependency>
<dependency>
<artifactId>failsafe</artifactId>
<groupId>net.jodah</groupId>
<version>2.4.4</version>
<version>${failsafe.version}</version>
</dependency>
<dependency>
<artifactId>caffeine</artifactId>
<groupId>com.github.ben-manes.caffeine</groupId>
<version>3.1.8</version>
</dependency>
<dependency>
<artifactId>jackson-databind</artifactId>
<groupId>com.fasterxml.jackson.core</groupId>
<version>2.15.2</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-yaml</artifactId>
<version>2.15.2</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jsr310</artifactId>
<version>2.15.2</version>
<version>${caffeine.version}</version>
</dependency>
<dependency>
<groupId>net.java.dev.jna</groupId>
<artifactId>jna-platform</artifactId>
<version>5.13.0</version>
<version>${jna-platform.version}</version>
</dependency>
<dependency>
<artifactId>kotlin-reflect</artifactId>
Expand All @@ -153,32 +149,32 @@
<dependency>
<groupId>org.jetbrains.kotlinx</groupId>
<artifactId>kotlinx-serialization-json</artifactId>
<version>1.6.2</version>
<version>${kotlinx-serialization-json.version}</version>
</dependency>
<dependency>
<artifactId>jcl-over-slf4j</artifactId>
<groupId>org.slf4j</groupId>
<version>1.7.32</version>
<version>${slf4j.version}</version>
</dependency>
<dependency>
<artifactId>httpclient5</artifactId>
<groupId>org.apache.httpcomponents.client5</groupId>
<version>5.2.1</version>
<version>${httpclient5.version}</version>
</dependency>
<dependency>
<artifactId>commons-codec</artifactId>
<groupId>commons-codec</groupId>
<version>1.16.0</version>
<version>${commons-codec.version}</version>
</dependency>
<dependency>
<artifactId>liquibase-core</artifactId>
<groupId>org.liquibase</groupId>
<version>4.24.0</version>
<version>${liquibase-core.version}</version>
</dependency>
<dependency>
<artifactId>liquibase-slf4j</artifactId>
<groupId>com.mattbertolini</groupId>
<version>5.0.0</version>
<version>${liquibase-slf4j.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
Expand Down
8 changes: 8 additions & 0 deletions vripper-core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,18 @@
<description>vripper-core</description>

<dependencies>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<artifactId>logback-classic</artifactId>
<groupId>ch.qos.logback</groupId>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-core</artifactId>
</dependency>
<dependency>
<artifactId>kotlin-stdlib</artifactId>
<groupId>org.jetbrains.kotlin</groupId>
Expand Down
2 changes: 1 addition & 1 deletion vripper-core/src/main/kotlin/me/vripper/repositories/impl/ImageRepositoryImpl.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ class ImageRepositoryImpl : ImageRepository {
}

override fun update(images: List<Image>) {
ImageTable.batchReplace(images, shouldReturnGeneratedValues = false) {
ImageTable.batchUpsert(images, shouldReturnGeneratedValues = false) {
this[ImageTable.id] = it.id
this[ImageTable.downloaded] = it.downloaded
this[ImageTable.host] = it.host
Expand Down
2 changes: 1 addition & 1 deletion vripper-core/src/main/kotlin/me/vripper/repositories/impl/PostDownloadStateRepositoryImpl.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ class PostDownloadStateRepositoryImpl :
}

override fun update(posts: List<Post>) {
PostTable.batchReplace(posts, shouldReturnGeneratedValues = false) { post ->
PostTable.batchUpsert(posts, shouldReturnGeneratedValues = false) { post ->
this[PostTable.id] = post.id
this[PostTable.status] = post.status.name
this[PostTable.done] = post.done
Expand Down
2 changes: 1 addition & 1 deletion vripper-core/src/main/kotlin/me/vripper/utilities/ApplicationProperties.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import kotlin.io.path.Path
import kotlin.io.path.pathString

object ApplicationProperties {
const val VERSION: String = "5.2.0"
const val VERSION: String = "5.3.0"
private const val BASE_DIR_NAME: String = "vripper"
private val portable = System.getProperty("vripper.portable", "true").toBoolean()
private val BASE_DIR: String = getBaseDir()
Expand Down
8 changes: 7 additions & 1 deletion vripper-gui/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<description>vripper-gui</description>

<properties>
<javafx.version>21</javafx.version>
<javafx.version>21.0.2</javafx.version>
</properties>

<dependencies>
Expand Down Expand Up @@ -100,6 +100,12 @@
<artifactId>tornadofx</artifactId>
<groupId>no.tornado</groupId>
<version>1.7.20</version>
<exclusions>
<exclusion>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib-jdk8</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<artifactId>vripper-core</artifactId>
Expand Down
8 changes: 1 addition & 7 deletions vripper-gui/src/main/kotlin/me/vripper/gui/view/Preview.kt
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package me.vripper.gui.view

import javafx.event.EventHandler
import javafx.scene.control.ProgressIndicator
import javafx.scene.image.Image
import javafx.scene.image.ImageView
Expand All @@ -18,7 +17,6 @@ class Preview(private val owner: Stage, private val images: List<String>) {

private val log by LoggerDelegate()
private val coroutineScope = CoroutineScope(SupervisorJob() + Dispatchers.IO)
private var previewLoadJob: Job? = null
val previewPopup = Popup()

init {
Expand All @@ -28,13 +26,12 @@ class Preview(private val owner: Stage, private val images: List<String>) {
}

fun hide() {
previewLoadJob?.cancel()
coroutineScope.cancel()
previewPopup.hide()
}

private fun show() {
previewLoadJob = coroutineScope.launch(Dispatchers.Default) {
coroutineScope.launch(Dispatchers.Default) {
yield()
val imageViewList = images.map {
withTimeout(10_000L) {
Expand All @@ -46,9 +43,6 @@ class Preview(private val owner: Stage, private val images: List<String>) {
yield()
runLater {
val hBox = HBox()
hBox.onMouseEntered = EventHandler {
hide()
}
imageViewList.forEach { hBox.add(it) }
previewPopup.content.clear()
previewPopup.content.add(hBox)
Expand Down
18 changes: 9 additions & 9 deletions vripper-gui/src/main/kotlin/me/vripper/gui/view/tables/PostsTableView.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,15 @@ class PostsTableView : View() {
prefWidth = 50.0
cellFactory = Callback {
val cell = PreviewTableCell<PostModel>()
cell.onMouseExited = EventHandler {
preview?.hide()
}
cell.onMouseMoved = EventHandler {
preview?.previewPopup?.apply {
x = it.screenX + 20
y = it.screenY + 10
}
}
cell.onMouseEntered = EventHandler { mouseEvent ->
preview?.hide()
if (cell.tableRow.item != null && cell.tableRow.item.previewList.isNotEmpty()) {
Expand All @@ -220,15 +229,6 @@ class PostsTableView : View() {
x = mouseEvent.screenX + 20
y = mouseEvent.screenY + 10
}
cell.onMouseMoved = EventHandler {
preview?.previewPopup?.apply {
x = it.screenX + 20
y = it.screenY + 10
}
}
cell.onMouseExited = EventHandler {
preview?.hide()
}
}
}
cell
Expand Down
19 changes: 9 additions & 10 deletions vripper-gui/src/main/kotlin/me/vripper/gui/view/tables/ThreadSelectionTableView.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,15 @@ class ThreadSelectionTableView : Fragment("Thread") {
column("Preview", ThreadSelectionModel::previewListProperty) {
cellFactory = Callback {
val cell = PreviewTableCell<ThreadSelectionModel>()
cell.alignment = Pos.CENTER
cell.onMouseExited = EventHandler {
preview?.hide()
}
cell.onMouseMoved = EventHandler {
preview?.previewPopup?.apply {
x = it.screenX + 20
y = it.screenY + 10
}
}
cell.onMouseEntered = EventHandler { mouseEvent ->
preview?.hide()
if (cell.tableRow.item != null && cell.tableRow.item.previewList.isNotEmpty()) {
Expand All @@ -91,15 +99,6 @@ class ThreadSelectionTableView : Fragment("Thread") {
x = mouseEvent.screenX + 20
y = mouseEvent.screenY + 10
}
cell.onMouseMoved = EventHandler {
preview?.previewPopup?.apply {
x = it.screenX + 20
y = it.screenY + 10
}
}
cell.onMouseExited = EventHandler {
preview?.hide()
}
}
}
cell
Expand Down
8 changes: 7 additions & 1 deletion vripper-web/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,19 @@
</parent>

<properties>
<spring-boot.version>3.1.5</spring-boot.version>
<spring-boot.version>3.2.2</spring-boot.version>
</properties>

<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
<exclusions>
<exclusion>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-logging</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
Expand Down

0 comments on commit 6d9aa4c

Please sign in to comment.