GH-48 Bump dependencies

dzikoysk · Feb 26, 2023 · e7fdf5c · e7fdf5c
1 parent 0d35483
commit e7fdf5c
Show file tree

Hide file tree

Showing 7 changed files with 42 additions and 23 deletions.
diff --git a/pom-application/.idea/kotlinc.xml b/pom-application/.idea/kotlinc.xml
diff --git a/pom-application/app/build.gradle b/pom-application/app/build.gradle
@@ -27,7 +27,7 @@ android {
         minSdk 29
         targetSdk 33
         versionCode 10
-        versionName "1.0.0-RC.10"
+        versionName "1.0.0-RC.11"
         archivesBaseName = "presence-of-mind-$versionName"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -75,30 +75,34 @@ android {
 }
 
 dependencies {
-    implementation("org.burnoutcrew.composereorderable:reorderable:0.9.2")
+    implementation('org.burnoutcrew.composereorderable:reorderable:0.9.6')
     implementation("io.github.androidpoet:dropdown:1.0.1")
-    implementation("io.github.vanpra.compose-material-dialogs:core:0.8.0-beta")
-    implementation("com.github.skydoves:landscapist-glide:1.5.3")
+    implementation('io.github.vanpra.compose-material-dialogs:core:0.9.0')
     implementation("com.github.jeziellago:compose-markdown:0.2.9")
     implementation("com.github.tfaki:ComposableSweetToast:1.0.1")
 
+    def landscapist_version = "2.1.3"
+    implementation("com.github.skydoves:landscapist-glide:$landscapist_version")
+    implementation("com.github.skydoves:landscapist-placeholder:$landscapist_version")
+    implementation("com.github.skydoves:landscapist-animation:$landscapist_version")
+
     def appUpdate = "2.0.1"
     implementation("com.google.android.play:app-update-ktx:$appUpdate")
 
-    def jackson = "2.14.0"
+    def jackson = '2.14.2'
     implementation("com.fasterxml.jackson.core:jackson-databind:$jackson")
     implementation("com.fasterxml.jackson.core:jackson-core:$jackson")
     implementation("com.fasterxml.jackson.core:jackson-annotations:$jackson")
     implementation("com.fasterxml.jackson.datatype:jackson-datatype-jdk8:$jackson")
     implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson")
     implementation("com.fasterxml.jackson.module:jackson-module-kotlin:$jackson")
 
-    def room_version = "2.4.3"
+    def room_version = '2.5.0'
     implementation "androidx.room:room-runtime:$room_version"
     annotationProcessor "androidx.room:room-compiler:$room_version"
     testImplementation "androidx.room:room-testing:$room_version"
 
-    def compose_libs_version = "1.4.0-alpha02"
+    def compose_libs_version = '1.4.0-beta02'
     implementation "androidx.compose.ui:ui:$compose_libs_version"
     implementation "androidx.compose.ui:ui-util:$compose_libs_version"
     implementation "androidx.compose.material:material:$compose_libs_version"
@@ -111,6 +115,6 @@ dependencies {
     implementation 'androidx.core:core-ktx:1.9.0'
 
     testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.4'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.0'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
 }
diff --git a/pom-application/app/src/main/AndroidManifest.xml b/pom-application/app/src/main/AndroidManifest.xml
@@ -4,6 +4,7 @@
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM"/>

diff --git a/...pp/src/main/java/net/dzikoysk/presenceofmind/model/task/reminder/EventReminderReceiver.kt b/...pp/src/main/java/net/dzikoysk/presenceofmind/model/task/reminder/EventReminderReceiver.kt
@@ -24,6 +24,7 @@ import net.dzikoysk.presenceofmind.shared.DefaultTimeProvider
 import net.dzikoysk.presenceofmind.shared.TimeProvider
 import java.time.Instant
 import java.util.UUID
+import kotlin.time.Duration.Companion.seconds
 
 const val CHANNEL_ID = "pom-event-reminder-channel"
 const val EVENT_TASK_EXTRA_ID = "pom-event-reminder-id"
@@ -41,7 +42,7 @@ class EventReminderReceiver(private val timeProvider: TimeProvider = DefaultTime
             intent.putExtra(EVENT_TASK_REMINDER_TIME, triggerAtMillis)
             val pendingIntent = PendingIntent.getBroadcast(context, task.id.hashCode(), intent, FLAG_CANCEL_CURRENT or FLAG_IMMUTABLE)
             val alarmManager = context.getSystemService(Context.ALARM_SERVICE) as AlarmManager?
-            alarmManager?.setExactAndAllowWhileIdle(AlarmManager.RTC_WAKEUP, triggerAtMillis, pendingIntent)
+            alarmManager?.setWindow(AlarmManager.RTC_WAKEUP, triggerAtMillis, 1.seconds.inWholeMilliseconds, pendingIntent)
         }
 
     }

diff --git a/pom-application/app/src/main/java/net/dzikoysk/presenceofmind/pages/dashboard/AvatarImage.kt b/pom-application/app/src/main/java/net/dzikoysk/presenceofmind/pages/dashboard/AvatarImage.kt
@@ -11,8 +11,11 @@ import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.res.vectorResource
 import androidx.compose.ui.unit.dp
-import com.skydoves.landscapist.CircularReveal
+import com.skydoves.landscapist.ImageOptions
+import com.skydoves.landscapist.animation.circular.CircularRevealPlugin
+import com.skydoves.landscapist.components.rememberImageComponent
 import com.skydoves.landscapist.glide.GlideImage
+import com.skydoves.landscapist.placeholder.placeholder.PlaceholderPlugin
 import net.dzikoysk.presenceofmind.R
 
 @Composable
@@ -25,10 +28,14 @@ fun AvatarImage(
             .height(32.dp)
             .clip(CircleShape)
             .clickable(onClick = { openMenu() }),
-        imageModel = "https://avatars.githubusercontent.com/u/75123628?s=200&v=4",
-        contentScale = ContentScale.Crop,
-        circularReveal = CircularReveal(duration = 0),
-        placeHolder = ImageVector.vectorResource(R.drawable.ic_baseline_check_circle_24),
-        error = ImageVector.vectorResource(id = R.drawable.ic_baseline_account_circle_24)
+        imageModel = { "https://avatars.githubusercontent.com/u/75123628?s=200&v=4" },
+        imageOptions = ImageOptions(
+            contentScale = ContentScale.Crop
+        ),
+        component = rememberImageComponent {
+            +CircularRevealPlugin(duration = 0)
+            +PlaceholderPlugin.Loading(ImageVector.vectorResource(R.drawable.ic_baseline_check_circle_24))
+            +PlaceholderPlugin.Failure(ImageVector.vectorResource(id = R.drawable.ic_baseline_account_circle_24))
+        }
     )
 }
diff --git a/pom-application/build.gradle b/pom-application/build.gradle
@@ -1,12 +1,12 @@
 buildscript {
     ext {
-        compose_version = '1.2.0-beta03'
+        compose_version = '1.3.1'
     }
 }// Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id 'com.android.application' version '7.3.1' apply false
-    id 'com.android.library' version '7.3.1' apply false
-    id 'org.jetbrains.kotlin.android' version '1.6.21' apply false
+    id 'com.android.application' version '7.4.1' apply false
+    id 'com.android.library' version '7.4.1' apply false
+    id 'org.jetbrains.kotlin.android' version '1.7.10' apply false
 }
 
 task clean(type: Delete) {

diff --git a/pom-application/gradle/wrapper/gradle-wrapper.properties b/pom-application/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sat Apr 30 13:26:52 CEST 2022
+#Sun Feb 26 15:33:17 CET 2023
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists