Skip to content

Commit

Permalink
7.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@themuzzleflare
themuzzleflare committed Sep 23, 2024
1 parent 3290116 commit 18906e3
Show file tree
Hide file tree
Showing 6 changed files with 203 additions and 5 deletions.
1 change: 0 additions & 1 deletion .idea/encodings.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 15 additions & 0 deletions .idea/icon.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion .idea/misc.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dedrmgui
Submodule dedrmgui updated 7 files
+4 −2 .gitignore
+10 −24 pom.xml
+3 −4 src/main/java/cloud/tavitian/dedrmgui/KindleDeDRMApplication.java
+30 −24 src/main/java/cloud/tavitian/dedrmgui/KindleDeDRMController.java
+17 −17 src/main/java/cloud/tavitian/dedrmgui/SettingsDict.java
+3 −0 src/main/java/cloud/tavitian/dedrmgui/package-info.java
+1 −0 src/main/java/module-info.java
2 changes: 1 addition & 1 deletion dedrmtools
Submodule dedrmtools updated 27 files
+70 −7 pom.xml
+6 −0 src/main/java/cloud/tavitian/dedrmtools/Book.java
+3 −0 src/main/java/cloud/tavitian/dedrmtools/BookFile.java
+20 −11 src/main/java/cloud/tavitian/dedrmtools/DeDRM.java
+9 −6 src/main/java/cloud/tavitian/dedrmtools/Debug.java
+4 −1 src/main/java/cloud/tavitian/dedrmtools/Util.java
+82 −74 src/main/java/cloud/tavitian/dedrmtools/kfxdedrm/BinaryIonParser.java
+3 −2 src/main/java/cloud/tavitian/dedrmtools/kfxdedrm/BytesIOInputStream.java
+48 −52 src/main/java/cloud/tavitian/dedrmtools/kfxdedrm/DRMIon.java
+55 −41 src/main/java/cloud/tavitian/dedrmtools/kfxdedrm/DRMIonVoucher.java
+2 −0 src/main/java/cloud/tavitian/dedrmtools/kfxdedrm/IonUtils.java
+11 −10 src/main/java/cloud/tavitian/dedrmtools/kfxdedrm/KFXZipBook.java
+1 −0 src/main/java/cloud/tavitian/dedrmtools/kfxdedrm/ParserState.java
+1 −0 src/main/java/cloud/tavitian/dedrmtools/kfxdedrm/Workspace.java
+4 −4 src/main/java/cloud/tavitian/dedrmtools/kindlekeys/IORegStorageDriveClasses.java
+2 −0 src/main/java/cloud/tavitian/dedrmtools/kindlekeys/Kernel32.java
+84 −72 src/main/java/cloud/tavitian/dedrmtools/kindlekeys/KindleDatabase.java
+4 −4 src/main/java/cloud/tavitian/dedrmtools/kindlekeys/KindleKey.java
+10 −4 src/main/java/cloud/tavitian/dedrmtools/kindlekeys/KindleKeyMacOS.java
+12 −8 src/main/java/cloud/tavitian/dedrmtools/kindlekeys/KindleKeyWindows.java
+4 −5 src/main/java/cloud/tavitian/dedrmtools/kindlekeys/KindlePID.java
+3 −6 src/main/java/cloud/tavitian/dedrmtools/kindlekeys/SystemProfilerStorageDriveDataTypes.java
+44 −19 src/main/java/cloud/tavitian/dedrmtools/mobidedrm/MobiBook.java
+3 −3 src/main/java/cloud/tavitian/dedrmtools/topazextract/TopazBook.java
+1 −0 src/test/java/cloud/tavitian/dedrmtools/DeDRMTest.java
+16 −0 src/test/java/cloud/tavitian/dedrmtools/kindlekeys/KindleKeyWindowsTest.java
+32 −32 src/test/java/cloud/tavitian/dedrmtools/mobidedrm/MobiBookTest.java
186 changes: 185 additions & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,20 @@

<groupId>cloud.tavitian</groupId>
<artifactId>kindlededrm</artifactId>
<version>6.0.0</version>
<version>7.0.0</version>
<packaging>pom</packaging>

<name>Kindle DeDRM</name>
<description>Modules related to DRM removal.</description>

<developers>
<developer>
<id>themuzzleflare</id>
<name>Paul Tavitian</name>
<email>paul@tavitian.net.au</email>
</developer>
</developers>

<modules>
<module>dedrmtools</module>
<module>dedrmgui</module>
Expand All @@ -24,6 +32,7 @@
<properties>
<maven.compiler.source>23</maven.compiler.source>
<maven.compiler.target>23</maven.compiler.target>
<release>23</release>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<junit.version>5.11.0</junit.version>
<javafx.version>23</javafx.version>
Expand All @@ -44,6 +53,14 @@
<version>24.1.0</version>
</dependency>

<!-- https://mvnrepository.com/artifact/org.apache.maven.plugin-tools/maven-plugin-annotations -->
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-annotations</artifactId>
<version>3.15.0</version>
<scope>provided</scope>
</dependency>

<!-- https://mvnrepository.com/artifact/org.junit.jupiter/junit-jupiter-api -->
<dependency>
<groupId>org.junit.jupiter</groupId>
Expand All @@ -61,6 +78,75 @@
</dependency>
</dependencies>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>cloud.tavitian</groupId>
<artifactId>dedrmtools</artifactId>
<version>${project.version}</version>
</dependency>

<!-- https://mvnrepository.com/artifact/org.apache.commons/commons-text -->
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-text</artifactId>
<version>1.12.0</version>
</dependency>

<!-- https://mvnrepository.com/artifact/org.tukaani/xz -->
<dependency>
<groupId>org.tukaani</groupId>
<artifactId>xz</artifactId>
<version>1.10</version>
</dependency>

<!-- https://mvnrepository.com/artifact/net.java.dev.jna/jna-platform-jpms -->
<dependency>
<groupId>net.java.dev.jna</groupId>
<artifactId>jna-platform-jpms</artifactId>
<version>5.15.0</version>
</dependency>

<!-- https://mvnrepository.com/artifact/org.openjfx/javafx-controls -->
<dependency>
<groupId>org.openjfx</groupId>
<artifactId>javafx-controls</artifactId>
<version>${javafx.version}</version>
</dependency>

<!-- https://mvnrepository.com/artifact/org.openjfx/javafx-fxml -->
<dependency>
<groupId>org.openjfx</groupId>
<artifactId>javafx-fxml</artifactId>
<version>${javafx.version}</version>
</dependency>

<!-- https://mvnrepository.com/artifact/io.github.mkpaz/atlantafx-base -->
<dependency>
<groupId>io.github.mkpaz</groupId>
<artifactId>atlantafx-base</artifactId>
<version>2.0.1</version>
</dependency>

<!-- https://mvnrepository.com/artifact/org.jfxtras/jmetro -->
<dependency>
<groupId>org.jfxtras</groupId>
<artifactId>jmetro</artifactId>
<version>11.6.16</version>
<exclusions>
<exclusion>
<groupId>org.controlsfx</groupId>
<artifactId>controlsfx</artifactId>
</exclusion>
<exclusion>
<groupId>org.openjfx</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
</dependencyManagement>

<build>
<plugins>
<!-- https://mvnrepository.com/artifact/org.apache.maven.plugins/maven-compiler-plugin -->
Expand All @@ -71,6 +157,9 @@
<configuration>
<source>${maven.compiler.source}</source>
<target>${maven.compiler.target}</target>
<release>${release}</release>
<verbose>true</verbose>
<detail>true</detail>
</configuration>
</plugin>

Expand All @@ -79,8 +168,103 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
<version>3.4.0</version>
<configuration>
<verbose>true</verbose>
<detail>true</detail>
</configuration>
</plugin>

<!-- https://mvnrepository.com/artifact/org.apache.maven.plugins/maven-install-plugin -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
<version>3.1.3</version>
<configuration>
<detail>true</detail>
</configuration>
</plugin>

<!-- https://mvnrepository.com/artifact/org.apache.maven.plugins/maven-jar-plugin -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.4.2</version>
<configuration>
<detail>true</detail>
</configuration>
</plugin>

<!-- https://mvnrepository.com/artifact/org.apache.maven.plugins/maven-resources-plugin -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>3.3.1</version>
<configuration>
<detail>true</detail>
</configuration>
</plugin>

<!-- https://mvnrepository.com/artifact/org.apache.maven.plugins/maven-surefire-plugin -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.5.0</version>
<configuration>
<detail>true</detail>
</configuration>
</plugin>
</plugins>
</build>

<!-- <profiles>-->
<!-- <profile>-->
<!-- <id>mac-aarch64</id>-->
<!-- <activation>-->
<!-- <os>-->
<!-- <name>Mac OS X</name>-->
<!-- <arch>aarch64</arch>-->
<!-- </os>-->
<!-- </activation>-->
<!-- </profile>-->

<!-- <profile>-->
<!-- <id>mac</id>-->
<!-- <activation>-->
<!-- <os>-->
<!-- <name>Mac OS X</name>-->
<!-- <arch>x86_64</arch>-->
<!-- </os>-->
<!-- </activation>-->
<!-- </profile>-->

<!-- <profile>-->
<!-- <id>win</id>-->
<!-- <activation>-->
<!-- <os>-->
<!-- <family>windows</family>-->
<!-- </os>-->
<!-- </activation>-->
<!-- </profile>-->

<!-- <profile>-->
<!-- <id>linux-aarch64</id>-->
<!-- <activation>-->
<!-- <os>-->
<!-- <name>Linux</name>-->
<!-- <arch>aarch64</arch>-->
<!-- </os>-->
<!-- </activation>-->
<!-- </profile>-->

<!-- <profile>-->
<!-- <id>linux</id>-->
<!-- <activation>-->
<!-- <os>-->
<!-- <name>Linux</name>-->
<!-- <arch>x86_64</arch>-->
<!-- </os>-->
<!-- </activation>-->
<!-- </profile>-->
<!-- </profiles>-->

</project>

0 comments on commit 18906e3

Please sign in to comment.