From 65693ca2ff33b672faface34a8ce680284e81881 Mon Sep 17 00:00:00 2001 From: Miku AuahDark Date: Thu, 28 Sep 2023 16:06:20 +0800 Subject: [PATCH] Fix build failures. --- app/build.gradle | 6 +++++- app/src/main/cpp/love | 2 +- app/src/main/cpp/megasource | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 2f9919c2..b5de20dd 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -19,7 +19,6 @@ android { externalNativeBuild { cmake { arguments "-DANDROID_STL=c++_shared" - cppFlags "-Wno-error=cast-function-type-strict" // https://issuetracker.google.com/issues/274493986 // Transitive shared library that's added through `add_dependencies` is not taken into // account. This result in liboboe.so and libluajit.so not get included into the final @@ -172,3 +171,8 @@ dependencies { implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0' implementation 'com.google.oboe:oboe:1.7.0' } + +// We don't even use Kotlin. Why we have to suffer... +configurations.implementation { + exclude group: 'org.jetbrains.kotlin', module: 'kotlin-stdlib-jdk8' +} diff --git a/app/src/main/cpp/love b/app/src/main/cpp/love index 96040b2b..f43c6fed 160000 --- a/app/src/main/cpp/love +++ b/app/src/main/cpp/love @@ -1 +1 @@ -Subproject commit 96040b2b2ab883087d1c8adbab60967143f844e8 +Subproject commit f43c6fedebdf0f0a241514271c141ac62e90ff6e diff --git a/app/src/main/cpp/megasource b/app/src/main/cpp/megasource index 84a7cbb3..44ba332e 160000 --- a/app/src/main/cpp/megasource +++ b/app/src/main/cpp/megasource @@ -1 +1 @@ -Subproject commit 84a7cbb396de12f13f9680bcb911a993fe49c49e +Subproject commit 44ba332ebeeca89e28ed9d24ea32819b197861bf