From 5ca67a238750d07ca698e2571db8842a622789d0 Mon Sep 17 00:00:00 2001
From: Gaurav Ujjwal <gujjwal00@gmail.com>
Date: Fri, 26 Nov 2021 00:25:42 +0000
Subject: [PATCH] Fix com.osfans.trime build

---
 metadata/com.osfans.trime.yml | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/metadata/com.osfans.trime.yml b/metadata/com.osfans.trime.yml
index 69e1f34316..bd0088922a 100644
--- a/metadata/com.osfans.trime.yml
+++ b/metadata/com.osfans.trime.yml
@@ -65,13 +65,12 @@ Builds:
 
   - versionName: 3.2.2
     versionCode: 20210813
-    disable: Fails to compile NoClassDefFoundError javax/xml/bind/annotation/XmlSchema
     commit: 0c588c11aacf174b11324158a8f7eb971ced33be
     subdir: app
     submodules: true
     sudo:
       - apt-get update || apt-get update
-      - apt-get -y install g++ openjdk-11-jdk
+      - apt-get -y install --no-install-recommends g++ openjdk-11-jdk-headless
       - update-alternatives --auto java
       - pushd build/srclib/capnproto/c++
       - autoreconf -i
@@ -83,10 +82,13 @@ Builds:
       - yes
     srclibs:
       - capnproto@v0.8.0
-    prebuild: $$SDK$$/tools/bin/sdkmanager 'cmake;3.18.1' > /dev/null
+    prebuild:
+      - JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64 $$SDK$$/tools/bin/sdkmanager 'cmake;3.18.1'
+        > /dev/null
+      - sed -i -e "/maven.aliyun.com/d" ../build.gradle
     scandelete:
       - app/src/main/jni
-    ndk: r22b
+    ndk: r23
 
   - versionName: 3.2.3
     versionCode: 20211002