Updates 11 01 26

.github/workflows/build.yaml

@@ -16,24 +16,28 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
       - name: Setup
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: 'temurin'
           java-version: '17'
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v5
       - name: Run tests
         run: ./gradlew ktfmtCheck
   build:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
       - name: Setup
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: 'temurin'
           java-version: '17'
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v5
       - name: Retrieve keystore for apk signing
         env:
           ENCODED_KEYSTORE: ${{ secrets.KEYSTORE }}
@@ -54,12 +58,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
       - name: Setup
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: 'temurin'
           java-version: '17'
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v5
       - name: Retrieve keystore for apk signing
         env:
           ENCODED_KEYSTORE: ${{ secrets.KEYSTORE }}

.gitignore

@@ -93,3 +93,6 @@ app/app/src/main/assets/search_plugins/1337.json
 app/app/src/main/assets/search_plugins/isohunt_nz.json
 app/app/src/main/assets/search_plugins/zooqle.json
 app/apikey.properties
+/extra_assets/docker/jackett/data
+/extra_assets/docker/prowlarr
+*.salive

app/app/build.gradle.kts

@@ -3,6 +3,7 @@ import java.util.Properties
 plugins {
     id("com.android.application")
     id("org.jetbrains.kotlin.android")
+    alias(libs.plugins.kotlin.serialization)
     id("org.jetbrains.kotlin.plugin.parcelize")
     id("com.google.dagger.hilt.android")
     id("androidx.navigation.safeargs.kotlin")
@@ -35,6 +36,8 @@ ktfmt {
     kotlinLangStyle()
 }
 
+kotlin { jvmToolchain(11) }
+
 android {
     namespace = "com.github.livingwithhippos.unchained"
     compileSdk = 36
@@ -43,8 +46,8 @@ android {
         applicationId = "com.github.livingwithhippos.unchained"
         minSdk = 27
         targetSdk = 36
-        versionCode = 56
-        versionName = "1.5.1"
+        versionCode = 57
+        versionName = "1.6.0"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -57,8 +60,8 @@ android {
             excludes.addAll(
                 listOf(
                     "META-INF/*.version",
-                    // manually added, markdown files should not be needed
-                    // was crashing with the jakarta xml bind api
+                    // manually added, Markdown files should not be needed
+                    // was crashing with the jakarta XML bind api
                     "META-INF/*.md",
                     "META-INF/proguard/*",
                     "/*.properties",
@@ -134,7 +137,6 @@ android {
         sourceCompatibility = JavaVersion.VERSION_11
         targetCompatibility = JavaVersion.VERSION_11
     }
-    kotlinOptions { jvmTarget = "11" }
     buildFeatures {
         viewBinding = true
         buildConfig = true
@@ -165,13 +167,6 @@ dependencies {
     implementation(libs.datastore.core)
     implementation(libs.datastore.prefs)
 
-    implementation(libs.jackson.kotlin)
-    implementation(libs.jackson.xml)
-    implementation(libs.woodstox)
-    // replaced legacy jaxb with jakarta
-    // https://github.com/FasterXML/jackson-modules-base
-    // implementation(libs.stax)
-    implementation(libs.jakarta.xmlapi)
     implementation(libs.documentfile)
 
     ksp(libs.moshi.codegen)
@@ -195,6 +190,7 @@ dependencies {
 
     implementation(libs.coroutines.core)
     implementation(libs.coroutines.android)
+    implementation(libs.kotlin.serialization.json)
 
     implementation(libs.material.version3)
 

app/app/proguard-rules.pro

@@ -20,16 +20,12 @@
 # hide the original source file name.
 #-renamesourcefileattribute SourceFile
 
-# avoid rewriting of proto datastore variables name. Remove when https://android-review.googlesource.com/c/platform/frameworks/support/+/1433465/ is available
--keep class * extends com.google.protobuf.GeneratedMessageLite {
-  <fields>;
-   }
-
 # https://github.com/square/retrofit#r8--proguard
 # With R8 full mode generic signatures are stripped for classes that are not
 # kept. Suspend functions are wrapped in continuations where the type argument
 # is used.
 -keep,allowobfuscation,allowshrinking class kotlin.coroutines.Continuation
+-dontwarn com.google.re2j.**
 
 # With R8 full mode generic signatures are stripped for classes that are not kept.
 -keep,allowobfuscation,allowshrinking class retrofit2.Response