srctree

Robin Linden parent b7adc8c8 a40d93a7
Use the same tox4j version in all builds

.github/workflows/nightly.yaml added: 4, removed: 9, total 0

@@ -13,10 +13,6 @@ jobs:

java-version: 1.8

- name: Install tox4j dependencies

run: sudo apt install yasm

- name: Fix tox4j dependency versions

run: |

sed -i 's/\$oldVersion/\$version/' buildSrc/src/main/kotlin/Dependencies.kt

sed -i 's/tox4j-c_arm-linux-androideabi/tox4j-c_armv7a-linux-androideabi/' buildSrc/src/main/kotlin/Dependencies.kt

- name: Build tox4j

run: |

./scripts/build-host -j$(nproc || sysctl -n hw.ncpu)

buildSrc/src/main/kotlin/Dependencies.kt added: 4, removed: 9, total 0

@@ -119,11 +119,10 @@ object Tox4j {

const val c = "org.toktok:tox4j-c_2.11:$version"

object Android {

private const val version = "0.2.12"

private const val oldVersion = "0.2.2" // The x86 build has been broken for a while.

const val x86_64 = "org.toktok:tox4j-c_x86_64-linux-android:$version"

const val arm = "org.toktok:tox4j-c_arm-linux-androideabi:$version"

const val arm = "org.toktok:tox4j-c_armv7a-linux-androideabi:$version"

const val aarch64 = "org.toktok:tox4j-c_aarch64-linux-android:$version"

const val i686 = "org.toktok:tox4j-c_i686-linux-android:$oldVersion"

const val i686 = "org.toktok:tox4j-c_i686-linux-android:$version"

}