downgrade to mathparser v4 because of license clash with f-droid

sal0max · Feb 6, 2024 · d0530bd · d0530bd
2 parents 38a544f + c464d3b
commit d0530bd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -110,8 +110,8 @@ dependencies {
     val moshiVersion = "1.15.1"
     implementation("com.squareup.moshi:moshi-kotlin:$moshiVersion")
     ksp("com.squareup.moshi:moshi-kotlin-codegen:$moshiVersion")
-    // math
-    implementation("org.mariuszgromada.math:MathParser.org-mXparser:5.2.1")
+    // math (v5 releases use incompatible license to fdroid: noinspection GradleDependency)
+    implementation("org.mariuszgromada.math:MathParser.org-mXparser:4.4.3")
     // charts
     implementation("com.robinhood.spark:spark:1.2.0")
     // test

diff --git a/app/src/main/kotlin/de/salomax/currencies/viewmodel/main/MainViewModel.kt b/app/src/main/kotlin/de/salomax/currencies/viewmodel/main/MainViewModel.kt
@@ -13,7 +13,6 @@ import de.salomax.currencies.util.getDecimalSeparator
 import de.salomax.currencies.util.hasAppendedCurrencySymbol
 import de.salomax.currencies.util.toHumanReadableNumber
 import org.mariuszgromada.math.mxparser.Expression
-import org.mariuszgromada.math.mxparser.License
 import java.text.Collator
 import java.time.LocalDate
 import java.time.ZoneId
@@ -63,9 +62,6 @@ class MainViewModel(val app: Application, onlyCache: Boolean = false) : AndroidV
      */
 
     init {
-        // MathParser.org-mXparser TOS
-        License.iConfirmNonCommercialUse("Salomax")
-
         // only update if data is old: https://github.com/Formicka/exchangerate.host
         // "Rates are updated around midnight UTC every working day."
         val currentDate = LocalDate.now(ZoneId.of("UTC"))