Merge pull request #23 from javaBin/dependency-upgrade

Bump versions

Author: jfjellstad

app/build.gradle

@@ -9,11 +9,11 @@ apply plugin: 'kotlinx-serialization'
 apply plugin: 'com.google.android.gms.oss-licenses-plugin'
 
 android {
-    compileSdkVersion 32
+    compileSdkVersion 33
     defaultConfig {
         applicationId "no.javazone.scheduler"
         minSdkVersion 24
-        targetSdkVersion 32
+        targetSdkVersion 33
         versionCode 4
         versionName "1.4"
         vectorDrawables.useSupportLibrary = true
@@ -50,7 +50,7 @@ android {
     // For Kotlin projects
     kotlinOptions {
         jvmTarget = "11"
-        freeCompilerArgs += ['-Xopt-in=kotlin.RequiresOptIn', '-Xjvm-default=enable']
+        freeCompilerArgs += ['-opt-in=kotlin.RequiresOptIn', '-Xjvm-default=all']
     }
     packagingOptions {
         resources {

app/src/main/java/no/javazone/scheduler/AppContainerImpl.kt

@@ -63,8 +63,8 @@ class AppContainerImpl(private val applicationContext: Context) : AppContainer {
 
     override val imageLoader: ImageLoader by lazy {
         ImageLoader.Builder(applicationContext)
-            .componentRegistry {
-                add(SvgDecoder(applicationContext))
+            .components {
+                add(SvgDecoder.Factory())
             }
             .build()
     }

app/src/main/java/no/javazone/scheduler/ui/partners/PartnersRoute.kt

@@ -21,7 +21,7 @@ import androidx.lifecycle.viewmodel.compose.viewModel
 import coil.ImageLoader
 import coil.annotation.ExperimentalCoilApi
 import coil.compose.LocalImageLoader
-import coil.compose.rememberImagePainter
+import coil.compose.rememberAsyncImagePainter
 import no.javazone.scheduler.AppContainer
 import no.javazone.scheduler.model.Partner
 import no.javazone.scheduler.viewmodels.PartnersViewModel
@@ -65,7 +65,7 @@ fun PartnersContent(
                 modifier = Modifier.padding(5.dp)
             ) {
                 Image(
-                    painter = rememberImagePainter(partner.logoUrl, imageLoader = imageLoader),
+                    painter = rememberAsyncImagePainter(partner.logoUrl, imageLoader = imageLoader),
                     contentDescription = partner.name,
                     modifier = Modifier
                         .size(74.dp)

app/src/main/java/no/javazone/scheduler/ui/sessions/DetailsRoute.kt

@@ -21,6 +21,7 @@ import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 import androidx.compose.ui.unit.dp
 import androidx.navigation.NavHostController
+import coil.compose.rememberAsyncImagePainter
 import coil.compose.rememberImagePainter
 import no.javazone.scheduler.R
 import no.javazone.scheduler.model.ConferenceTalk
@@ -126,7 +127,7 @@ private fun DetailsContent(
                         Column {
                             if (speaker.avatarUrl != null) {
                                 Image(
-                                    painter = rememberImagePainter(speaker.avatarUrl),
+                                    painter = rememberAsyncImagePainter(speaker.avatarUrl),
                                     contentDescription = speaker.name,
                                     modifier = Modifier.size(74.dp)
                                 )

app/src/main/java/no/javazone/scheduler/utils/Constants.kt

@@ -1,6 +1,8 @@
 package no.javazone.scheduler.utils
 
 import okhttp3.MediaType
+import okhttp3.MediaType.Companion.toMediaType
+import okhttp3.MediaType.Companion.toMediaTypeOrNull
 import java.time.LocalDate
 
 const val SESSIONS_FILENAME = "sessions.json"
@@ -11,7 +13,7 @@ const val APP_PREFERENCE_FILE = "javazone"
 const val JAVAZONE_BASE_URL = "https://sleepingpill.javazone.no/"
 const val JAVAZONE_DATE_PATTERN = "dd.MM.yyyy"
 
-val APPLICATION_JSON: MediaType = MediaType.parse("application/json")!!
+val APPLICATION_JSON: MediaType = "application/json".toMediaType()
 
 
 val WORKSHOP_DAY: LocalDate = LocalDate.of(2021, 12, 7)

build.gradle

@@ -3,25 +3,25 @@
 buildscript {
     ext {
         accompanistVersion = '0.20.0'
-        activityVersion = '1.5.0'
-        appCompatVersion = '1.4.2'
-        coilVersion = '1.4.0'
+        activityVersion = '1.5.1'
+        appCompatVersion = '1.5.0'
+        coilVersion = '2.2.0'
         composeCompilerVersion = '1.2.0'
-        composeVersion = '1.2.0-rc03'
+        composeVersion = '1.2.1'
         constraintLayoutVersion = '2.1.1'
         coreKtxVersion = '1.8.0'
         coroutinesVersion = '1.5.2'
         desugarLibVersion = '1.1.5'
         espressoVersion = '3.4.0'
         extJunitVersion = '1.1.3'
-        googleMaterialversion = '1.7.0-alpha03'
+        googleMaterialversion = '1.7.0-beta01'
         kotlinVersion = "1.7.0"
         kotlinxSerializationVersion = "1.3.2"
-        lifecycleVersion = '2.5.0'
-        material3Version = '1.0.0-alpha14'
+        lifecycleVersion = '2.5.1'
+        material3Version = '1.0.0-alpha16'
         materialVersion = '1.4.0'
-        navVersion = "2.5.0"
-        junitVersion = "4.12"
+        navVersion = "2.5.1"
+        junitVersion = "4.13.2"
         retroFit2Version = "2.9.0"
         retroFitKotlinSerializationVersion = "0.8.0"
         roboeletricVersion = "4.7"
@@ -37,7 +37,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.2.1'
+        classpath 'com.android.tools.build:gradle:7.2.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files