Updated libraries, added updates

This commit is contained in:
Robinson 2021-04-09 16:02:04 +02:00
parent 238bc5a515
commit 9c6aaab616
6 changed files with 28 additions and 58 deletions

View File

@ -11,7 +11,7 @@ Specifically, this project was created to extract files from within a .cab which
Microsoft CAB file format: http://msdn.microsoft.com/en-us/library/bb417343.aspx Microsoft CAB file format: http://msdn.microsoft.com/en-us/library/bb417343.aspx
- This is for cross-platform use, specifically - linux 32/64, mac 32/64, and windows 32/64. Java 6+ - This is for cross-platform use, specifically - linux 32/64, mac 32/64, and windows 32/64. Java 8+
@ -33,18 +33,15 @@ Maven Info
Gradle Info Gradle Info
--------- ---------
```` ```
dependencies { dependencies {
... ...
compile "com.dorkbox:CabParser:2.15" implementation("com.dorkbox:CabParser:2.15")
} }
```` ```
Or if you don't want to use Maven, you can access the files directly here:
https://repo1.maven.org/maven2/com/dorkbox/CabParser/
License License
--------- ---------
This project is © 2012 dorkbox llc, and is distributed under the terms of the Apache v2.0 License. See file "LICENSE" for further references. This project is © 2021 dorkbox llc, and is distributed under the terms of the Apache v2.0 License. See file "LICENSE" for further
references.

View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2020 dorkbox, llc * Copyright 2021 dorkbox, llc
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -14,34 +14,30 @@
* limitations under the License. * limitations under the License.
*/ */
import java.time.Instant import java.time.Instant
/////////////////////////////// ///////////////////////////////
////// PUBLISH TO SONATYPE / MAVEN CENTRAL ////// PUBLISH TO SONATYPE / MAVEN CENTRAL
////// TESTING : (to local maven repo) <'publish and release' - 'publishToMavenLocal'> ////// TESTING : (to local maven repo) <'publish and release' - 'publishToMavenLocal'>
////// RELEASE : (to sonatype/maven central), <'publish and release' - 'publishToSonatypeAndRelease'> ////// RELEASE : (to sonatype/maven central), <'publish and release' - 'publishToSonatypeAndRelease'>
/////////////////////////////// ///////////////////////////////
gradle.startParameter.showStacktrace = ShowStacktrace.ALWAYS_FULL // always show the stacktrace! gradle.startParameter.showStacktrace = ShowStacktrace.ALWAYS // always show the stacktrace!
gradle.startParameter.warningMode = WarningMode.All gradle.startParameter.warningMode = WarningMode.All
plugins { plugins {
java id("com.dorkbox.Licensing") version "2.5.5"
id("com.dorkbox.VersionUpdate") version "2.3"
id("com.dorkbox.GradleUtils") version "1.17"
id("com.dorkbox.GradlePublish") version "1.10"
id("com.dorkbox.GradleUtils") version "1.8" kotlin("jvm") version "1.4.32"
id("com.dorkbox.CrossCompile") version "1.0.1"
id("com.dorkbox.Licensing") version "1.4"
id("com.dorkbox.VersionUpdate") version "1.4.1"
id("com.dorkbox.GradlePublish") version "1.2"
kotlin("jvm") version "1.3.72"
} }
object Extras { object Extras {
// set for the project // set for the project
const val description = "Parse and extract data from Microsoft LZX compressed .cab files for Java 6+" const val description = "Parse and extract data from Microsoft LZX compressed .cab files for Java 8+"
const val group = "com.dorkbox" const val group = "com.dorkbox"
const val version = "2.16" const val version = "2.16"
@ -51,9 +47,8 @@ object Extras {
const val vendor = "Dorkbox LLC" const val vendor = "Dorkbox LLC"
const val vendorUrl = "https://dorkbox.com" const val vendorUrl = "https://dorkbox.com"
const val url = "https://git.dorkbox.com/dorkbox/CabParser" const val url = "https://git.dorkbox.com/dorkbox/CabParser"
val buildDate = Instant.now().toString()
val JAVA_VERSION = JavaVersion.VERSION_1_6.toString() val buildDate = Instant.now().toString()
} }
/////////////////////////////// ///////////////////////////////
@ -61,6 +56,8 @@ object Extras {
/////////////////////////////// ///////////////////////////////
GradleUtils.load("$projectDir/../../gradle.properties", Extras) GradleUtils.load("$projectDir/../../gradle.properties", Extras)
GradleUtils.fixIntellijPaths() GradleUtils.fixIntellijPaths()
GradleUtils.defaultResolutionStrategy()
GradleUtils.compileConfiguration(JavaVersion.VERSION_1_8)
licensing { licensing {
license(License.APACHE_2) { license(License.APACHE_2) {
@ -68,18 +65,6 @@ licensing {
url(Extras.url) url(Extras.url)
note(Extras.description) note(Extras.description)
} }
license("Dorkbox Utils", License.APACHE_2) {
author(Extras.vendor)
url("https://git.dorkbox.com/dorkbox/Utilities")
}
license("jOOU - Unsigned Numbers for Java", License.APACHE_2) {
copyright( 2013)
author("Lukas Eder, lukas.eder@gmail.com")
url("https://github.com/jOOQ/jOOU")
}
} }
sourceSets { sourceSets {
@ -93,21 +78,6 @@ sourceSets {
} }
} }
repositories {
// mavenLocal() // this must be first!
jcenter()
}
///////////////////////////////
////// Task defaults
///////////////////////////////
tasks.withType<JavaCompile> {
options.encoding = "UTF-8"
sourceCompatibility = Extras.JAVA_VERSION
targetCompatibility = Extras.JAVA_VERSION
}
tasks.jar.get().apply { tasks.jar.get().apply {
manifest { manifest {
// https://docs.oracle.com/javase/tutorial/deployment/jar/packageman.html // https://docs.oracle.com/javase/tutorial/deployment/jar/packageman.html
@ -125,12 +95,15 @@ tasks.jar.get().apply {
} }
} }
tasks.compileJava.get().apply { repositories {
println("\tCompiling classes to Java $sourceCompatibility") mavenLocal() // this must be first!
jcenter()
} }
dependencies { dependencies {
implementation("com.dorkbox:Utilities:1.2") implementation("com.dorkbox:ByteUtilities:1.0")
implementation("com.dorkbox:Updates:1.0")
implementation("com.dorkbox:Utilities:1.9")
} }
publishToSonatype { publishToSonatype {

View File

@ -22,7 +22,7 @@ import java.util.Date;
import dorkbox.cabParser.CabException; import dorkbox.cabParser.CabException;
import dorkbox.cabParser.CorruptCabException; import dorkbox.cabParser.CorruptCabException;
import dorkbox.util.bytes.LittleEndian; import dorkbox.bytes.LittleEndian;
public final class CabFileEntry { public final class CabFileEntry {
public static final Charset US_ASCII = Charset.forName("US-ASCII"); public static final Charset US_ASCII = Charset.forName("US-ASCII");

View File

@ -18,7 +18,7 @@ package dorkbox.cabParser.structure;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import dorkbox.util.bytes.LittleEndian; import dorkbox.bytes.LittleEndian;
public final class CabFolderEntry implements CabConstants { public final class CabFolderEntry implements CabConstants {
/** offset of the first CFDATA block in this folder, 4bytes */ /** offset of the first CFDATA block in this folder, 4bytes */

View File

@ -22,7 +22,7 @@ import java.io.InputStream;
import dorkbox.cabParser.CabException; import dorkbox.cabParser.CabException;
import dorkbox.cabParser.CabStreamSaver; import dorkbox.cabParser.CabStreamSaver;
import dorkbox.cabParser.CorruptCabException; import dorkbox.cabParser.CorruptCabException;
import dorkbox.util.bytes.LittleEndian; import dorkbox.bytes.LittleEndian;
public final class CabHeader implements CabConstants { public final class CabHeader implements CabConstants {

View File

@ -22,7 +22,7 @@ import java.io.InputStream;
import dorkbox.cabParser.CabException; import dorkbox.cabParser.CabException;
import dorkbox.cabParser.Checksum; import dorkbox.cabParser.Checksum;
import dorkbox.cabParser.CorruptCabException; import dorkbox.cabParser.CorruptCabException;
import dorkbox.util.bytes.LittleEndian; import dorkbox.bytes.LittleEndian;
public final class CfDataRecord { public final class CfDataRecord {
/** checksum of this CFDATA entry , 4bytes */ /** checksum of this CFDATA entry , 4bytes */