From 7da31b3d08e2aae5b2da6377d87b5c2013712776 Mon Sep 17 00:00:00 2001
From: woheller69 <7481083-woheller69@users.noreply.gitlab.com>
Date: Fri, 19 Jan 2024 09:40:26 +0000
Subject: [PATCH] Remove non-FOSS dependency from Kore

---
 metadata/org.xbmc.kore.yml | 20 +++-----------------
 1 file changed, 3 insertions(+), 17 deletions(-)

diff --git a/metadata/org.xbmc.kore.yml b/metadata/org.xbmc.kore.yml
index 2877cabc19..aeaa9d75ef 100644
--- a/metadata/org.xbmc.kore.yml
+++ b/metadata/org.xbmc.kore.yml
@@ -165,24 +165,8 @@ Builds:
     rm:
       - art/launcher/sam/concepts/Kore_App_Icons.zip
 
-  - versionName: v3.0.0
-    versionCode: 31
-    disable: https://github.com/xbmc/Kore/pull/913#issuecomment-1296919988
-    commit: 44cbc6fe8b49d7b703880e217b1282cce63b482f
-    subdir: app
-    sudo:
-      - apt-get update
-      - apt-get install -y openjdk-11-jdk-headless
-      - update-alternatives --auto java
-    gradle:
-      - yes
-    prebuild: sed -i -e '/core-google-shortcuts/d' -e "/constraintlayout/aimplementation
-      ('androidx.core:core-google-shortcuts:1.0.1'){exclude group:'com.google.android.gms'}"
-      build.gradle
-
   - versionName: v3.1.0
     versionCode: 33
-    disable: https://github.com/xbmc/Kore/pull/913#issuecomment-1296919988
     commit: 5f711140d7e9593f4b8048f0c613288b54e17302
     subdir: app
     sudo:
@@ -191,8 +175,10 @@ Builds:
       - update-java-alternatives -a
     gradle:
       - yes
+    prebuild: sed -i -e '/implementation('\''androidx\.core:core-google-shortcuts:1\.1\.0'\'')
+      {/,/}/d' build.gradle
 
-AutoUpdateMode: None
+AutoUpdateMode: Version
 UpdateCheckMode: Tags ^v[\d.]+$
 CurrentVersion: v3.1.0
 CurrentVersionCode: 33