From bace546b72fd676a5d627d65eee9bf1be11f19af Mon Sep 17 00:00:00 2001 From: opty Date: Sat, 7 Mar 2020 11:55:09 +0100 Subject: [PATCH] Use official sevenzipjbinding, prepare 2.3.0 --- CHANGELOG.fr.md | 2 ++ CHANGELOG.md | 7 +++++++ JRomManager/build.gradle | 30 +++++++++++++++++------------- JRomManager/dist/ver.properties | 4 ++-- README.fr.md | 18 +++++++++++------- README.md | 16 ++++++++++------ 6 files changed, 49 insertions(+), 28 deletions(-) diff --git a/CHANGELOG.fr.md b/CHANGELOG.fr.md index 60dba736..068444f0 100644 --- a/CHANGELOG.fr.md +++ b/CHANGELOG.fr.md @@ -1,3 +1,5 @@ +## A METTRE A JOUR + ## Release v1.4 build 15 - Ajout de la vérification de la disponibilité d'une mise à jour au démarrage avec Historique des changement (entre la version actuelle et la dernière) le tout affiché dans boite de dialogue - Ajout de la mise à jour en un clic: cliquez juste sur le lien dans la boite de dialogue de la recherche de mise à jour, et ça va télécharger et mettre à jour tout seul, puis redémarrer en utilisant [JUpdater](https://github.com/optyfr/JUpdater) diff --git a/CHANGELOG.md b/CHANGELOG.md index 966bfc9d..42789705 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## Release v2.3.0 +- Added "Copy CRC/SHA1/Name" menu entries on entities in Report views and in ProfileViewer +- Added "Detail" menu on entries in Report views +- Added "Search on the Web" menu on entries in Report views and in ProfileViewer +- Fixed Torrent Check report problem +- Reuse back new latest SevenZipJBinding from official repository + ## Release v2.2.0 - Using custom sevenzipjbinding which include more architectures/os, and a more recent sevenzip version - RAR5 extraction (as per sevenzipjbinding update) diff --git a/JRomManager/build.gradle b/JRomManager/build.gradle index 8c82d5f8..2aead4ff 100644 --- a/JRomManager/build.gradle +++ b/JRomManager/build.gradle @@ -53,7 +53,8 @@ repositories { apply plugin: 'de.undercouch.download' -def SevenZipJBindingVersion = '16.02-2.01beta' +def SevenZipJBindingMyVersion = '16.02-2.01beta' +def SevenZipJBindingVersion = '16.02-2.01' task downloadSevenZipJBinding(type: Download) { src 'https://github.com/optyfr/sevenzipjbinding/releases/download/'+SevenZipJBindingVersion+'/sevenzipjbinding.jar' @@ -62,15 +63,17 @@ task downloadSevenZipJBinding(type: Download) { } task downloadSevenZipJBindingPlatforms(type: Download) { src([ - 'https://github.com/optyfr/sevenzipjbinding/releases/download/'+SevenZipJBindingVersion+'/sevenzipjbinding-FreeBSD-amd64.jar', - 'https://github.com/optyfr/sevenzipjbinding/releases/download/'+SevenZipJBindingVersion+'/sevenzipjbinding-FreeBSD-i386.jar', - 'https://github.com/optyfr/sevenzipjbinding/releases/download/'+SevenZipJBindingVersion+'/sevenzipjbinding-Linux-aarch64.jar', - 'https://github.com/optyfr/sevenzipjbinding/releases/download/'+SevenZipJBindingVersion+'/sevenzipjbinding-Linux-amd64.jar', - 'https://github.com/optyfr/sevenzipjbinding/releases/download/'+SevenZipJBindingVersion+'/sevenzipjbinding-Linux-arm.jar', - 'https://github.com/optyfr/sevenzipjbinding/releases/download/'+SevenZipJBindingVersion+'/sevenzipjbinding-Linux-i386.jar', - 'https://github.com/optyfr/sevenzipjbinding/releases/download/'+SevenZipJBindingVersion+'/sevenzipjbinding-Mac-x86_64.jar', - 'https://github.com/optyfr/sevenzipjbinding/releases/download/'+SevenZipJBindingVersion+'/sevenzipjbinding-Windows-amd64.jar', - 'https://github.com/optyfr/sevenzipjbinding/releases/download/'+SevenZipJBindingVersion+'/sevenzipjbinding-Windows-x86.jar' + 'https://github.com/optyfr/sevenzipjbinding/releases/download/'+SevenZipJBindingMyVersion+'/sevenzipjbinding-FreeBSD-amd64.jar', + 'https://github.com/optyfr/sevenzipjbinding/releases/download/'+SevenZipJBindingMyVersion+'/sevenzipjbinding-FreeBSD-i386.jar', + 'https://repo1.maven.org/maven2/net/sf/sevenzipjbinding/sevenzipjbinding-linux-armv71/'+SevenZipJBindingVersion+'/sevenzipjbinding-linux-armv71-'+SevenZipJBindingVersion+'.jar', + 'https://repo1.maven.org/maven2/net/sf/sevenzipjbinding/sevenzipjbinding-linux-armv6/'+SevenZipJBindingVersion+'/sevenzipjbinding-linux-armv6-'+SevenZipJBindingVersion+'.jar', + 'https://repo1.maven.org/maven2/net/sf/sevenzipjbinding/sevenzipjbinding-linux-armv5/'+SevenZipJBindingVersion+'/sevenzipjbinding-linux-armv5-'+SevenZipJBindingVersion+'.jar', + 'https://repo1.maven.org/maven2/net/sf/sevenzipjbinding/sevenzipjbinding-linux-arm64/'+SevenZipJBindingVersion+'/sevenzipjbinding-linux-arm64-'+SevenZipJBindingVersion+'.jar', + 'https://repo1.maven.org/maven2/net/sf/sevenzipjbinding/sevenzipjbinding-linux-amd64/'+SevenZipJBindingVersion+'/sevenzipjbinding-linux-amd64-'+SevenZipJBindingVersion+'.jar', + 'https://repo1.maven.org/maven2/net/sf/sevenzipjbinding/sevenzipjbinding-linux-i386/'+SevenZipJBindingVersion+'/sevenzipjbinding-linux-i386-'+SevenZipJBindingVersion+'.jar', + 'https://repo1.maven.org/maven2/net/sf/sevenzipjbinding/sevenzipjbinding-mac-x86_64/'+SevenZipJBindingVersion+'/sevenzipjbinding-mac-x86_64-'+SevenZipJBindingVersion+'.jar', + 'https://repo1.maven.org/maven2/net/sf/sevenzipjbinding/sevenzipjbinding-windows-amd64/'+SevenZipJBindingVersion+'/sevenzipjbinding-windows-amd64-'+SevenZipJBindingVersion+'.jar', + 'https://repo1.maven.org/maven2/net/sf/sevenzipjbinding/sevenzipjbinding-windows-x86/'+SevenZipJBindingVersion+'/sevenzipjbinding-windows-x86-'+SevenZipJBindingVersion+'.jar' ]) dest "$buildDir/SevenZipJBinding" onlyIfModified true @@ -83,7 +86,8 @@ task SevenZipJBinding { task SevenZipJBindingPlatforms { dependsOn downloadSevenZipJBindingPlatforms - outputs.file fileTree(dir: "$buildDir/SevenZipJBinding/", exclude : "sevenzipjbinding-"+SevenZipJBindingVersion+".jar") + outputs.file fileTree(dir: "$buildDir/SevenZipJBinding/") +// outputs.file fileTree(dir: "$buildDir/SevenZipJBinding/", exclude : "sevenzipjbinding-"+SevenZipJBindingVersion+".jar") } task SevenZipJBindingAllPlatforms(type: Jar, dependsOn: SevenZipJBindingPlatforms) { @@ -177,7 +181,7 @@ subprojects { } implementation('net.sf.sevenzipjbinding:sevenzipjbinding') { version { - prefer '9.20-2.00beta' + prefer SevenZipJBindingVersion } } implementation('one.util:streamex') { @@ -271,7 +275,7 @@ project(':JRomManager:jrmcore') { implementation group: 'commons-io', name: 'commons-io' implementation group: 'org.apache.commons', name: 'commons-text' implementation group: 'org.apache.commons', name: 'commons-compress' - implementation files(SevenZipJBinding) + implementation group: 'net.sf.sevenzipjbinding', name: 'sevenzipjbinding' runtime files(SevenZipJBindingAllPlatforms) implementation group: 'one.util', name: 'streamex' implementation group: 'com.sun.activation', name: 'javax.activation' diff --git a/JRomManager/dist/ver.properties b/JRomManager/dist/ver.properties index e6d75edf..8355a203 100644 --- a/JRomManager/dist/ver.properties +++ b/JRomManager/dist/ver.properties @@ -1,2 +1,2 @@ -Specification-Version=2.2 -Implementation-Version=1 +Specification-Version=2.3 +Implementation-Version=0 diff --git a/README.fr.md b/README.fr.md index 7acbdb28..4ee1596a 100644 --- a/README.fr.md +++ b/README.fr.md @@ -8,23 +8,27 @@ Un gestionnaire de Roms entièrement écrit en Java et distribué sous la licens - **MIT** : Jtrrntzip (basé sur trrntZipDN par Gordon J), commonmark (par Atlassian), minimal-json (par Ralf Sternberg) - **LGPL 2.1 + restriction unRAR** : SevenZipJBinding (par Boris Brodski) - **Apache 2.0** : StreamEx (par Tagir Valeev), Gradle Wrapper, et toutes les librairies "Apache commons" +- **BSD 3** : NanoHTTPD ## Technique _Prérequis de développement minimum_: - Eclipse Oxygen pour Java avec le module WindowBuilder (module standard d'Eclipse) et Gradle Buildship (dans Eclipse Marketplace) - Java SDK 8 - Dependances Gradle (via dépôts Maven) - - Apache Commons Codec 1.11 - - Apache Commons IO 2.6 - - Apache Commons Lang3 3.7 - - Apache Commons Text 1.3 - - Apache Commons Compress 1.16 (utilisé uniquement pour lister le contenu des fichiers 7zip) - - StreamEx 0.6.7 - - SevenZipJBinding 9.20-2.00 (plus rapide que l'usage de la commande en ligne de 7zip) + - Apache Commons Codec 1.+ + - Apache Commons CLI 1.+ + - Apache Commons IO 2.+ + - Apache Commons Lang3 3.+ + - Apache Commons Text 1.+ + - Apache Commons Compress 1.+ (utilisé uniquement pour lister le contenu des fichiers 7zip) + - StreamEx 0.7.+ + - SevenZipJBinding 16.20-2.01 (plus rapide que l'usage de la commande en ligne de 7zip) + - NanoHTTPD 2.+ - Dépendances via sous-modules Git - [Jtrrntzip](https://github.com/optyfr/Jtrrntzip) - [JUpdater](https://github.com/optyfr/JUpdater) - [JLauncher](https://github.com/optyfr/JLauncher) + - [JRomManager-WebClient](https://github.com/optyfr/JRomManager-WebClient) _Prérequis d'utilisation minimum_: - 1Go de Ram libre (2Go ou plus si utilisation des Software Lists, l'option multicoeur, la compression 7z en mode ultra, ...) diff --git a/README.md b/README.md index 2b2fb60a..44753d65 100644 --- a/README.md +++ b/README.md @@ -11,19 +11,22 @@ A Rom Manager entirely written in Java and released under GPL-2 - **LGPL 2.1 with unRAR restriction** : [SevenZipJBinding](https://github.com/borisbrodski/sevenzipjbinding) (by Boris Brodski) - **LGPL 3** : [SmartGWT](https://www.smartclient.com/product/smartgwt.jsp) (Isomorphic) - **Apache 2.0** : [StreamEx](https://github.com/amaembo/streamex) (by Tagir Valeev), [Gradle build tool](https://github.com/gradle/gradle), [Lombok Gradle plugin](https://github.com/franzbecker/gradle-lombok), [GWT SDK](http://www.gwtproject.org) (Google), [GWT WebSockets](https://github.com/sksamuel/gwt-websockets) (Stephen Samuel), and all the [Apache commons](https://commons.apache.org/) libraries +- **BSD 3** : [NanoHTTPD](https://github.com/NanoHttpd/nanohttpd) ## Technical _Minimal development requirements_: - Eclipse Oxygen for Java with WindowBuilder feature and Gradle Buildship - Java 8 - Gradle dependencies (via Maven repositories) - - Apache Commons Codec 1.13 - - Apache Commons IO 2.6 - - Apache Commons Lang3 3.9 - - Apache Commons Text 1.8 - - Apache Commons Compress 1.19 (used solely to list 7zip content) - - StreamEx 0.6.8 + - Apache Commons Codec 1.+ + - Apache Commons CLI 1.+ + - Apache Commons IO 2.+ + - Apache Commons Lang3 3.+ + - Apache Commons Text 1.+ + - Apache Commons Compress 1.+ (used solely to list 7zip content) + - StreamEx 0.7.+ - SevenZipJBinding 16.02-2.01 (faster than using 7z cmd line) + - NanoHTTPD 2.+ - Git submodules dependencies - [Jtrrntzip](https://github.com/optyfr/Jtrrntzip) - [JUpdater](https://github.com/optyfr/JUpdater) @@ -118,6 +121,7 @@ If you just want to recompile sources without using an IDE (Eclipse), here are t - RAR4 and RAR5 decompression - Multi-volume decompression (RAR and 7Zip) - Command Line Mode with access to all functionalities and environment variable support +- Copy to clipboard and search on the web functions ## Short Term Planned Features - Mode to keep existing container archive format