Remove dependency on kotlin stdlib

According to:
https://kotlinlang.org/docs/whatsnew14.html#dependency-on-the-standard-library-added-by-default
the explicit dependency is no longer needed.

.github/workflows/main.yml

@@ -9,6 +9,7 @@ on:
 jobs:
   Test:
     runs-on: self-hosted
+    timeout-minutes: 30
     steps:
     - name: Check out source code
       uses: actions/checkout@v1

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## [2.1.1] -- 2022-09-24
+### Fixed
+- Fix Tasker plugin (@iSoron, #1503)
+
 ## [2.1.0] -- 2022-09-10
 ### Added
 - Allow user to add notes to specific dates (@vbh, #1103)

build.gradle.kts

@@ -1,6 +1,6 @@
 plugins {
-    val kotlinVersion = "1.7.10"
+    val kotlinVersion = "1.7.21"
-    id("com.android.application") version ("7.3.0-rc01") apply (false)
+    id("com.android.application") version ("7.3.1") apply (false)
     id("org.jetbrains.kotlin.android") version kotlinVersion apply (false)
     id("org.jetbrains.kotlin.kapt") version kotlinVersion apply (false)
     id("org.jetbrains.kotlin.android.extensions") version kotlinVersion apply (false)

uhabits-android/build.gradle.kts

@@ -35,8 +35,8 @@ android {
     compileSdk = 32
 
     defaultConfig {
-        versionCode = 20100
+        versionCode = 20101
-        versionName = "2.1.0"
+        versionName = "2.1.1"
         minSdk = 28
         targetSdk = 31
         applicationId = "org.isoron.uhabits"
@@ -80,11 +80,11 @@ android {
 }
 
 dependencies {
-    val daggerVersion = "2.43.2"
+    val daggerVersion = "2.44.2"
-    val kotlinVersion = "1.7.10"
+    val kotlinVersion = "1.7.21"
     val kxCoroutinesVersion = "1.6.4"
     val ktorVersion = "1.6.8"
-    val espressoVersion = "3.4.0"
+    val espressoVersion = "3.5.0"
 
     androidTestImplementation("androidx.test.espresso:espresso-contrib:$espressoVersion")
     androidTestImplementation("androidx.test.espresso:espresso-core:$espressoVersion")
@@ -92,10 +92,10 @@ dependencies {
     androidTestImplementation("com.linkedin.dexmaker:dexmaker-mockito:2.28.3")
     androidTestImplementation("io.ktor:ktor-client-mock:$ktorVersion")
     androidTestImplementation("io.ktor:ktor-jackson:$ktorVersion")
-    androidTestImplementation("androidx.annotation:annotation:1.4.0")
+    androidTestImplementation("androidx.annotation:annotation:1.5.0")
-    androidTestImplementation("androidx.test.ext:junit:1.1.3")
+    androidTestImplementation("androidx.test.ext:junit:1.1.4")
     androidTestImplementation("androidx.test.uiautomator:uiautomator:2.2.0")
-    androidTestImplementation("androidx.test:rules:1.4.0")
+    androidTestImplementation("androidx.test:rules:1.5.0")
     androidTestImplementation("com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0")
     compileOnly("javax.annotation:jsr250-api:1.0")
     coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:1.2.2")
@@ -110,11 +110,11 @@ dependencies {
     implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion")
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:$kxCoroutinesVersion")
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$kxCoroutinesVersion")
-    implementation("androidx.appcompat:appcompat:1.5.0")
+    implementation("androidx.appcompat:appcompat:1.5.1")
     implementation("androidx.legacy:legacy-preference-v14:1.0.0")
     implementation("androidx.legacy:legacy-support-v4:1.0.0")
-    implementation("com.google.android.material:material:1.6.1")
+    implementation("com.google.android.material:material:1.8.0")
-    implementation("com.opencsv:opencsv:5.6")
+    implementation("com.opencsv:opencsv:5.7.1")
     implementation(project(":uhabits-core"))
     kapt("com.google.dagger:dagger-compiler:$daggerVersion")
     kaptAndroidTest("com.google.dagger:dagger-compiler:$daggerVersion")

uhabits-android/src/main/AndroidManifest.xml

@@ -270,7 +270,7 @@
         <!-- Locale/Tasker -->
         <receiver
             android:name=".automation.FireSettingReceiver"
-            android:exported="false">
+            android:exported="true">
             <intent-filter>
                 <action android:name="com.twofortyfouram.locale.intent.action.FIRE_SETTING" />
             </intent-filter>

uhabits-android/src/main/java/org/isoron/uhabits/activities/settings/SettingsFragment.kt

@@ -22,6 +22,7 @@ import android.app.backup.BackupManager
 import android.content.Intent
 import android.content.SharedPreferences
 import android.content.SharedPreferences.OnSharedPreferenceChangeListener
+import android.net.Uri
 import android.os.Bundle
 import android.provider.Settings
 import android.util.Log
@@ -43,6 +44,7 @@ import org.isoron.uhabits.core.utils.DateUtils.Companion.getLongWeekdayNames
 import org.isoron.uhabits.notifications.AndroidNotificationTray.Companion.createAndroidNotificationChannel
 import org.isoron.uhabits.notifications.RingtoneManager
 import org.isoron.uhabits.utils.StyledResources
+import org.isoron.uhabits.utils.startActivitySafely
 import org.isoron.uhabits.widgets.WidgetUpdater
 import java.util.Calendar
 
@@ -92,10 +94,12 @@ class SettingsFragment : PreferenceFragmentCompat(), OnSharedPreferenceChangeLis
 
     override fun onPreferenceTreeClick(preference: Preference): Boolean {
         val key = preference.key ?: return false
-        if (key == "reminderSound") {
+        when (key) {
+            "reminderSound" -> {
                 showRingtonePicker()
                 return true
-        } else if (key == "reminderCustomize") {
+            }
+            "reminderCustomize" -> {
                 createAndroidNotificationChannel(requireContext())
                 val intent = Intent(Settings.ACTION_CHANNEL_NOTIFICATION_SETTINGS)
                 intent.putExtra(Settings.EXTRA_APP_PACKAGE, requireContext().packageName)
@@ -103,6 +107,12 @@ class SettingsFragment : PreferenceFragmentCompat(), OnSharedPreferenceChangeLis
                 startActivity(intent)
                 return true
             }
+            "rateApp" -> {
+                val intent = Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.playStoreURL)))
+                activity?.startActivitySafely(intent)
+                return true
+            }
+        }
         return super.onPreferenceTreeClick(preference)
     }
 

uhabits-android/src/main/java/org/isoron/uhabits/notifications/SnoozeDelayPickerActivity.kt

@@ -33,7 +33,8 @@ import org.isoron.uhabits.HabitsApplication
 import org.isoron.uhabits.R
 import org.isoron.uhabits.activities.AndroidThemeSwitcher
 import org.isoron.uhabits.core.models.Habit
-import org.isoron.uhabits.core.ui.ThemeSwitcher.Companion.THEME_LIGHT
+import org.isoron.uhabits.core.ui.views.DarkTheme
+import org.isoron.uhabits.core.ui.views.LightTheme
 import org.isoron.uhabits.receivers.ReminderController
 import org.isoron.uhabits.utils.SystemUtils
 import java.util.Calendar
@@ -51,11 +52,8 @@ class SnoozeDelayPickerActivity : FragmentActivity(), OnItemClickListener {
         val app = applicationContext as HabitsApplication
         val appComponent = app.component
         val themeSwitcher = AndroidThemeSwitcher(this, appComponent.preferences)
-        if (themeSwitcher.getSystemTheme() == THEME_LIGHT) {
+        themeSwitcher.setTheme()
-            setTheme(R.style.BaseDialog)
+
-        } else {
-            setTheme(R.style.BaseDialogDark)
-        }
         val data = intent.data
         if (data == null) {
             finish()
@@ -75,6 +73,16 @@ class SnoozeDelayPickerActivity : FragmentActivity(), OnItemClickListener {
         SystemUtils.unlockScreen(this)
     }
 
+    private fun AndroidThemeSwitcher.setTheme() {
+        if (this.isNightMode) {
+            setTheme(R.style.BaseDialogDark)
+            this.currentTheme = DarkTheme()
+        } else {
+            setTheme(R.style.BaseDialog)
+            this.currentTheme = LightTheme()
+        }
+    }
+
     private fun showTimePicker() {
         val calendar = Calendar.getInstance()
         val dialog = TimePickerDialog.newInstance(

uhabits-android/src/main/play/release-notes/en-US/default.txt

@@ -1,6 +1,10 @@
+2.1.1:
+* Fix Tasker plugin
+
 2.1:
 * Add notes to specific dates
 * Track at-most measurable habits
 * Add skips to measurable habits
 * Bring back custom frequencies
 * Other minor improvements and bug fixes
+

uhabits-android/src/main/res/xml/preferences.xml

@@ -160,11 +160,9 @@
         </Preference>
 
         <Preference
+                android:key="rateApp"
                 android:title="@string/pref_rate_this_app"
                 app:iconSpaceReserved="false">
-            <intent
-                    android:action="android.intent.action.VIEW"
-                    android:data="@string/playStoreURL" />
         </Preference>
 
         <Preference

uhabits-core/assets/test/habitbull4.csv

@@ -0,0 +1,3 @@
+HabitName,HabitDescription,HabitCategory,CalendarDate,Value,CommentText
+Caffeine,,Coffee Consumption,2022-11-21,80,
+Caffeine,,Coffee Consumption,2022-11-22,80,

uhabits-core/build.gradle.kts

@@ -43,13 +43,12 @@ kotlin {
         val jvmMain by getting {
             dependencies {
                 implementation(kotlin("stdlib-jdk8"))
-                compileOnly("com.google.dagger:dagger:2.43.2")
+                compileOnly("com.google.dagger:dagger:2.44.2")
                 implementation("com.google.guava:guava:31.1-android")
-                implementation("org.jetbrains.kotlin:kotlin-stdlib:1.7.10")
                 implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.4")
-                implementation("androidx.annotation:annotation:1.4.0")
+                implementation("androidx.annotation:annotation:1.5.0")
                 implementation("com.google.code.findbugs:jsr305:3.0.2")
-                implementation("com.opencsv:opencsv:5.6")
+                implementation("com.opencsv:opencsv:5.7.1")
                 implementation("commons-codec:commons-codec:1.15")
                 implementation("org.apache.commons:commons-lang3:3.12.0")
             }
@@ -59,7 +58,7 @@ kotlin {
             dependencies {
                 implementation(kotlin("test"))
                 implementation(kotlin("test-junit"))
-                implementation("org.xerial:sqlite-jdbc:3.39.2.1")
+                implementation("org.xerial:sqlite-jdbc:3.40.0.0")
                 implementation("org.hamcrest:hamcrest:2.2")
                 implementation("org.apache.commons:commons-io:1.3.2")
                 implementation("com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0")

uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/io/HabitBullCSVImporter.kt

@@ -86,10 +86,12 @@ class HabitBullCSVImporter
                         logger.info("Found a value of $value, considering this habit as numerical.")
                         h.type = HabitType.NUMERICAL
                     }
-                    h.originalEntries.add(Entry(timestamp, value, notes))
+                    h.originalEntries.add(Entry(timestamp, value * 1000, notes))
                 }
             }
         }
+
+        map.forEach { (_, habit) -> habit.recompute() }
     }
 
     private fun parseTimestamp(rawValue: String): Timestamp {

uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/io/ImportTest.kt

@@ -85,8 +85,8 @@ class ImportTest : BaseUnitTest() {
         assertThat(habit.type, equalTo(HabitType.NUMERICAL))
         assertThat(habit.description, equalTo(""))
         assertThat(habit.frequency, equalTo(Frequency.DAILY))
-        assertThat(getValue(habit, 2021, 9, 1), equalTo(30))
+        assertThat(getValue(habit, 2021, 9, 1), equalTo(30000))
-        assertThat(getValue(habit, 2022, 1, 8), equalTo(100))
+        assertThat(getValue(habit, 2022, 1, 8), equalTo(100000))
 
         val habit2 = habitList.getByPosition(1)
         assertThat(habit2.name, equalTo("run"))
@@ -98,6 +98,21 @@ class ImportTest : BaseUnitTest() {
         assertTrue(isChecked(habit2, 2022, 1, 19))
     }
 
+    @Test
+    @Throws(IOException::class)
+    fun testHabitBullCSV4() {
+        importFromFile("habitbull4.csv")
+        assertThat(habitList.size(), equalTo(1))
+
+        val habit = habitList.getByPosition(0)
+        assertThat(habit.name, equalTo("Caffeine"))
+        assertThat(habit.type, equalTo(HabitType.NUMERICAL))
+        assertThat(habit.description, equalTo(""))
+        assertThat(habit.frequency, equalTo(Frequency.DAILY))
+        assertThat(getValue(habit, 2022, 11, 21), equalTo(80000))
+        assertThat(getValue(habit, 2022, 11, 22), equalTo(80000))
+    }
+
     @Test
     @Throws(IOException::class)
     fun testLoopDB() {

uhabits-server/build.gradle.kts

@@ -34,8 +34,8 @@ application {
 
 dependencies {
     val ktorVersion = "1.6.8"
-    val kotlinVersion = "1.7.10"
+    val kotlinVersion = "1.7.21"
-    val logbackVersion = "1.4.0"
+    val logbackVersion = "1.4.5"
     implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion")
     implementation("io.ktor:ktor-server-netty:$ktorVersion")
     implementation("ch.qos.logback:logback-classic:$logbackVersion")