Skip to content

Commit

Permalink
Don't deliver fontforge assets. Not using yet, will save 5megs of APK
Browse files Browse the repository at this point in the history
  • Loading branch information
@ViliusSutkus89
ViliusSutkus89 committed Dec 27, 2023
1 parent 2908dbe commit 9482f1c
Show file tree
Hide file tree
Showing 2 changed files with 42 additions and 42 deletions.
72 changes: 36 additions & 36 deletions fontforge/build.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
Expand Down Expand Up @@ -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
// }
}
}
}
Expand All @@ -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
// }
}
}
}
Expand All @@ -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
// }
}
}
}
Expand Down
12 changes: 6 additions & 6 deletions pdf2htmlEX/build.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
Expand All @@ -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")
}
}
Expand Down

0 comments on commit 9482f1c

Please sign in to comment.