Skip to content

Commit

Permalink
Use official sevenzipjbinding, prepare 2.3.0
Browse files Browse the repository at this point in the history
  • Loading branch information
opty authored and opty committed Mar 7, 2020
1 parent 9af5106 commit bace546
Show file tree
Hide file tree
Showing 6 changed files with 49 additions and 28 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.fr.md
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
30 changes: 17 additions & 13 deletions JRomManager/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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
Expand All @@ -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) {
Expand Down Expand Up @@ -177,7 +181,7 @@ subprojects {
}
implementation('net.sf.sevenzipjbinding:sevenzipjbinding') {
version {
prefer '9.20-2.00beta'
prefer SevenZipJBindingVersion
}
}
implementation('one.util:streamex') {
Expand Down Expand Up @@ -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'
Expand Down
4 changes: 2 additions & 2 deletions JRomManager/dist/ver.properties
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Specification-Version=2.2
Implementation-Version=1
Specification-Version=2.3
Implementation-Version=0
18 changes: 11 additions & 7 deletions README.fr.md
Original file line number Diff line number Diff line change
Expand Up @@ -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, ...)
Expand Down
16 changes: 10 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit bace546

Please sign in to comment.