From 9482f1ca31704f2f3dd2f8eb3afadda43fe9635c Mon Sep 17 00:00:00 2001 From: Vilius Sutkus '89 Date: Wed, 27 Dec 2023 11:12:55 +0200 Subject: [PATCH] Don't deliver fontforge assets. Not using yet, will save 5megs of APK --- fontforge/build.gradle.kts | 72 ++++++++++++++++++------------------- pdf2htmlEX/build.gradle.kts | 12 +++---- 2 files changed, 42 insertions(+), 42 deletions(-) diff --git a/fontforge/build.gradle.kts b/fontforge/build.gradle.kts index 539e419..92e0d12 100644 --- a/fontforge/build.gradle.kts +++ b/fontforge/build.gradle.kts @@ -9,15 +9,15 @@ group = rootProject.group // Hardcode a list of available versions val portVersion = when(project.findProperty("packageVersion")) { "20170731" -> { - version = "20170731-beta-9" + version = "20170731-beta-10" "20170731" } "20200314" -> { - version = "20200314-beta-14" + version = "20200314-beta-15" "20200314" } else /* "20230101" */ -> { - version = "20230101-beta-14" + version = "20230101-beta-15" "20230101" } } @@ -323,17 +323,17 @@ when (portVersion) { ) } - val dst = layout.buildDirectory.asFile.get().resolve("assets/fontforge/share").apply { mkdirs() } - // @TODO: check if different ABI has matching share contents - installDirectoryFor(com.android.ndkports.Abi.Arm).resolve("share").copyRecursively(dst) { file, exception -> - if (exception !is FileAlreadyExistsException) { - throw exception - } - if (!file.readBytes().contentEquals(exception.file.readBytes())) { - throw exception - } - OnErrorAction.SKIP - } +// val dst = layout.buildDirectory.asFile.get().resolve("assets/fontforge/share").apply { mkdirs() } +// // @TODO: check if different ABI has matching share contents +// installDirectoryFor(com.android.ndkports.Abi.Arm).resolve("share").copyRecursively(dst) { file, exception -> +// if (exception !is FileAlreadyExistsException) { +// throw exception +// } +// if (!file.readBytes().contentEquals(exception.file.readBytes())) { +// throw exception +// } +// OnErrorAction.SKIP +// } } } } @@ -357,17 +357,17 @@ when (portVersion) { ) } - val dst = layout.buildDirectory.asFile.get().resolve("assets/fontforge/share").apply { mkdirs() } - // @TODO: check if different ABI has matching share contents - installDirectoryFor(com.android.ndkports.Abi.Arm).resolve("share").copyRecursively(dst) { file, exception -> - if (exception !is FileAlreadyExistsException) { - throw exception - } - if (!file.readBytes().contentEquals(exception.file.readBytes())) { - throw exception - } - OnErrorAction.SKIP - } +// val dst = layout.buildDirectory.asFile.get().resolve("assets/fontforge/share").apply { mkdirs() } +// // @TODO: check if different ABI has matching share contents +// installDirectoryFor(com.android.ndkports.Abi.Arm).resolve("share").copyRecursively(dst) { file, exception -> +// if (exception !is FileAlreadyExistsException) { +// throw exception +// } +// if (!file.readBytes().contentEquals(exception.file.readBytes())) { +// throw exception +// } +// OnErrorAction.SKIP +// } } } } @@ -391,17 +391,17 @@ when (portVersion) { ) } - val dst = layout.buildDirectory.asFile.get().resolve("assets/fontforge/share").apply { mkdirs() } - // @TODO: check if different ABI has matching share contents - installDirectoryFor(com.android.ndkports.Abi.Arm).resolve("share").copyRecursively(dst) { file, exception -> - if (exception !is FileAlreadyExistsException) { - throw exception - } - if (!file.readBytes().contentEquals(exception.file.readBytes())) { - throw exception - } - OnErrorAction.SKIP - } +// val dst = layout.buildDirectory.asFile.get().resolve("assets/fontforge/share").apply { mkdirs() } +// // @TODO: check if different ABI has matching share contents +// installDirectoryFor(com.android.ndkports.Abi.Arm).resolve("share").copyRecursively(dst) { file, exception -> +// if (exception !is FileAlreadyExistsException) { +// throw exception +// } +// if (!file.readBytes().contentEquals(exception.file.readBytes())) { +// throw exception +// } +// OnErrorAction.SKIP +// } } } } diff --git a/pdf2htmlEX/build.gradle.kts b/pdf2htmlEX/build.gradle.kts index 4b1efde..3b5a2d2 100644 --- a/pdf2htmlEX/build.gradle.kts +++ b/pdf2htmlEX/build.gradle.kts @@ -8,16 +8,16 @@ group = rootProject.group // Hardcode a list of available versions val portVersion = when(project.findProperty("packageVersion")) { "0.18.7-poppler-0.81.0" -> { - version = "0.18.7-poppler-0.81.0-beta-8" + version = "0.18.7-poppler-0.81.0-beta-9" "0.18.7-poppler-0.81.0" } "0.18.8.rc1" -> { - version = "0.18.8.rc1-beta-8" + version = "0.18.8.rc1-beta-9" "0.18.8.rc1" } // https://github.com/pdf2htmlEX/pdf2htmlEX/pull/154 Hoping it will be named rc2 else /* "0.18.8.rc2" */ -> { - version = "0.18.8.rc2-beta-7" + version = "0.18.8.rc2-beta-8" "0.18.8.rc2" } } @@ -36,15 +36,15 @@ dependencies { when (portVersion) { "0.18.7-poppler-0.81.0" -> { - implementation("com.viliussutkus89.ndk.thirdparty:fontforge${ndkVersionSuffix}${dependencyLibraryTypeSuffix}:20170731-beta-9") + implementation("com.viliussutkus89.ndk.thirdparty:fontforge${ndkVersionSuffix}${dependencyLibraryTypeSuffix}:20170731-beta-10") implementation("com.viliussutkus89.ndk.thirdparty:poppler${ndkVersionSuffix}${dependencyLibraryTypeSuffix}:0.81.0-beta-6") } "0.18.8.rc1" -> { - implementation("com.viliussutkus89.ndk.thirdparty:fontforge${ndkVersionSuffix}${dependencyLibraryTypeSuffix}:20200314-beta-14") + implementation("com.viliussutkus89.ndk.thirdparty:fontforge${ndkVersionSuffix}${dependencyLibraryTypeSuffix}:20200314-beta-15") implementation("com.viliussutkus89.ndk.thirdparty:poppler${ndkVersionSuffix}${dependencyLibraryTypeSuffix}:0.89.0-beta-7") } "0.18.8.rc2" -> { - implementation("com.viliussutkus89.ndk.thirdparty:fontforge${ndkVersionSuffix}${dependencyLibraryTypeSuffix}:20230101-beta-14") + implementation("com.viliussutkus89.ndk.thirdparty:fontforge${ndkVersionSuffix}${dependencyLibraryTypeSuffix}:20230101-beta-15") implementation("com.viliussutkus89.ndk.thirdparty:poppler${ndkVersionSuffix}${dependencyLibraryTypeSuffix}:23.12.0-beta-5") } }