From 96a43a7c328d552ed6080439023ccb9006deb1f4 Mon Sep 17 00:00:00 2001 From: Thomas Date: Tue, 18 Feb 2025 12:13:56 +0100 Subject: [PATCH] Fix build issue --- app/src/main/res/values-ta/strings.xml | 4 ++-- colorPicker/build.gradle | 7 ++++++- mathjaxandroid/build.gradle | 2 +- .../mathjax/android/ApplicationTest.java | 13 ------------- 4 files changed, 9 insertions(+), 17 deletions(-) delete mode 100644 mathjaxandroid/src/androidTest/java/de/timfreiheit/mathjax/android/ApplicationTest.java diff --git a/app/src/main/res/values-ta/strings.xml b/app/src/main/res/values-ta/strings.xml index cb6086e6..dc4a4415 100644 --- a/app/src/main/res/values-ta/strings.xml +++ b/app/src/main/res/values-ta/strings.xml @@ -499,8 +499,8 @@ செய்தியை இடுகையிடுதல்… செய்தி %d/ %d நேரம்: %, 2f %% - <! [CDATA [உள்ளடக்கத்தைக் காட்டு>]>> - <! [CDATA [உள்ளடக்கத்தை மறைக்க <]]> + + பதிவு செய்வதை நிறுத்துங்கள் அறிக்கை %1$s இந்த இடுகையுடன் என்ன நடக்கிறது என்று சொல்லுங்கள் diff --git a/colorPicker/build.gradle b/colorPicker/build.gradle index b000b4ae..3106399f 100644 --- a/colorPicker/build.gradle +++ b/colorPicker/build.gradle @@ -6,7 +6,7 @@ android { defaultConfig { minSdkVersion 15 targetSdkVersion 33 - + multiDexEnabled true testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } @@ -25,11 +25,16 @@ android { // Add a new configuration to hold your dependencies configurations { libConfig + implementation.exclude group: 'org.jetbrains', module: 'annotations' + configureEach { + exclude group: 'androidx.lifecycle', module: 'lifecycle-viewmodel-ktx' + } } dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') //noinspection GradleCompatible + implementation 'androidx.multidex:multidex:2.0.1' implementation 'androidx.appcompat:appcompat:1.5.1' implementation 'androidx.preference:preference:1.2.0' implementation 'com.google.android.material:material:1.8.0' diff --git a/mathjaxandroid/build.gradle b/mathjaxandroid/build.gradle index 346bbc0e..4af4cd5e 100644 --- a/mathjaxandroid/build.gradle +++ b/mathjaxandroid/build.gradle @@ -4,7 +4,7 @@ android { compileSdkVersion 33 defaultConfig { - minSdkVersion 8 + minSdkVersion 14 targetSdkVersion 33 } buildTypes { diff --git a/mathjaxandroid/src/androidTest/java/de/timfreiheit/mathjax/android/ApplicationTest.java b/mathjaxandroid/src/androidTest/java/de/timfreiheit/mathjax/android/ApplicationTest.java deleted file mode 100644 index a06c236f..00000000 --- a/mathjaxandroid/src/androidTest/java/de/timfreiheit/mathjax/android/ApplicationTest.java +++ /dev/null @@ -1,13 +0,0 @@ -package de.timfreiheit.mathjax.android; - -import android.app.Application; -import android.test.ApplicationTestCase; - -/** - * Testing Fundamentals - */ -public class ApplicationTest extends ApplicationTestCase { - public ApplicationTest() { - super(Application.class); - } -} \ No newline at end of file