diff --git a/README.md b/README.md index 43c3a6a..f4927e7 100644 --- a/README.md +++ b/README.md @@ -52,7 +52,7 @@ from https://docs.docker.com/get-docker/. Then run the following command to star have not tested it on Windows yet): ``` -touch ~/.remarkable-pocket ~/.rmapi && mkdir -p ~/.rmapi-cache && docker run -it --env TZ=Europe/Amsterdam -p 65112:65112 -v ~/.remarkable-pocket:/root/.remarkable-pocket -v ~/.rmapi:/root/.rmapi -v ~/.rmapi-cache:/root/.cache/rmapi ghcr.io/nov1n/remarkable-pocket:0.4.0 +touch ~/.remarkable-pocket ~/.rmapi && mkdir -p ~/.rmapi-cache && docker run -it --env TZ=Europe/Amsterdam -p 65112:65112 -v ~/.remarkable-pocket:/root/.remarkable-pocket -v ~/.rmapi:/root/.rmapi -v ~/.rmapi-cache:/root/.cache/rmapi ghcr.io/nov1n/remarkable-pocket:0.5.0 ``` The first time you run the application, you will be asked to authorize Pocket and Remarkable Cloud. Once you have done diff --git a/build.gradle b/build.gradle index 53fd083..07d9c30 100644 --- a/build.gradle +++ b/build.gradle @@ -1,13 +1,13 @@ plugins { - id "org.springframework.boot" version "2.5.5" - id "io.spring.dependency-management" version "1.0.11.RELEASE" - id "com.google.cloud.tools.jib" version "3.3.0" - id "com.github.johnrengelman.shadow" version "7.1.0" + id "org.springframework.boot" version "3.3.4" + id "io.spring.dependency-management" version "1.1.6" + id "com.google.cloud.tools.jib" version "3.4.3" + id "com.github.johnrengelman.shadow" version "8.1.1" id "java" } group = "nl.carosi" -version = "0.4.0" +version = "0.5.0" java { toolchain { diff --git a/docker-compose.yml b/docker-compose.yml index 586c9e5..d1d29bf 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,6 +1,6 @@ services: remarkable-pocket: - image: ghcr.io/nov1n/remarkable-pocket:0.4.0 + image: ghcr.io/nov1n/remarkable-pocket:0.5.0 restart: always environment: - TZ=Europe/Amsterdam diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ffed3a2..a595206 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/main/java/nl/carosi/remarkablepocket/ConnectivityChecker.java b/src/main/java/nl/carosi/remarkablepocket/ConnectivityChecker.java index 137bb0d..39b41f4 100644 --- a/src/main/java/nl/carosi/remarkablepocket/ConnectivityChecker.java +++ b/src/main/java/nl/carosi/remarkablepocket/ConnectivityChecker.java @@ -1,7 +1,8 @@ package nl.carosi.remarkablepocket; import java.io.IOException; -import java.net.URL; +import java.net.URI; +import java.net.URISyntaxException; import java.util.function.Consumer; final class ConnectivityChecker { @@ -10,9 +11,9 @@ final class ConnectivityChecker { static void ensureConnected(Consumer out) { while (true) { try { - new URL("http://www.google.com").openConnection().connect(); + new URI("http://www.google.com").toURL().openConnection().connect(); break; - } catch (IOException e) { + } catch (IOException | URISyntaxException e) { out.accept( "Unable to connect to the internet. Please check your internet connection."); try { diff --git a/src/main/java/nl/carosi/remarkablepocket/DownloadService.java b/src/main/java/nl/carosi/remarkablepocket/DownloadService.java index 8308bcd..a1d8963 100644 --- a/src/main/java/nl/carosi/remarkablepocket/DownloadService.java +++ b/src/main/java/nl/carosi/remarkablepocket/DownloadService.java @@ -8,7 +8,7 @@ import java.util.List; import java.util.Optional; import java.util.concurrent.atomic.AtomicInteger; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; import nl.carosi.remarkablepocket.model.Article; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/nl/carosi/remarkablepocket/RemarkableApi.java b/src/main/java/nl/carosi/remarkablepocket/RemarkableApi.java index d93da16..5ed15e7 100644 --- a/src/main/java/nl/carosi/remarkablepocket/RemarkableApi.java +++ b/src/main/java/nl/carosi/remarkablepocket/RemarkableApi.java @@ -16,7 +16,7 @@ import java.util.Scanner; import java.util.function.Consumer; import java.util.regex.Pattern; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; import nl.carosi.remarkablepocket.model.Document; import org.apache.logging.log4j.util.Strings; import org.slf4j.Logger; diff --git a/src/main/java/nl/carosi/remarkablepocket/RemarkableService.java b/src/main/java/nl/carosi/remarkablepocket/RemarkableService.java index f3af247..4ccfc8a 100644 --- a/src/main/java/nl/carosi/remarkablepocket/RemarkableService.java +++ b/src/main/java/nl/carosi/remarkablepocket/RemarkableService.java @@ -5,7 +5,7 @@ import java.nio.file.Path; import java.util.List; import java.util.Objects; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; import nl.carosi.remarkablepocket.model.DocumentMetadata; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/nl/carosi/remarkablepocket/SyncCommand.java b/src/main/java/nl/carosi/remarkablepocket/SyncCommand.java index 17f8ffa..89fd3d3 100644 --- a/src/main/java/nl/carosi/remarkablepocket/SyncCommand.java +++ b/src/main/java/nl/carosi/remarkablepocket/SyncCommand.java @@ -19,7 +19,7 @@ sortOptions = false, usageHelpAutoWidth = true, // TODO: Read from gradle.properties - version = "0.4.0", + version = "0.5.0", mixinStandardHelpOptions = true) class SyncCommand implements Callable { @Option( diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index dd77ebe..71875de 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1,3 +1,5 @@ logging.level.nl.siegmann.epublib=OFF #logging.level.nl.carosi.remarkablepocket=DEBUG logging.pattern.console=[%d{yyyy-MM-dd HH:mm:ss}] %clr(%m){faint}%n +logging.level.org.springframework.core.annotation=ERROR +spring.main.allow-circular-references=true \ No newline at end of file