Dependencies bump

This commit is contained in:
Sad Ellie 2022-05-14 12:47:37 +03:00
parent d119c94b0a
commit b09fb4dc2c
3 changed files with 13 additions and 10 deletions

View File

@ -127,13 +127,13 @@ dependencies {
implementation("androidx.navigation:navigation-compose:2.5.0-beta01") implementation("androidx.navigation:navigation-compose:2.5.0-beta01")
// Material Design 3 // Material Design 3
implementation("androidx.compose.material3:material3:1.0.0-alpha10") implementation("androidx.compose.material3:material3:1.0.0-alpha11")
// Hilt and navigation // Hilt and navigation
implementation("androidx.hilt:hilt-navigation-compose:1.0.0") implementation("androidx.hilt:hilt-navigation-compose:1.0.0")
kapt("com.google.dagger:dagger-android-processor:2.41") kapt("com.google.dagger:dagger-android-processor:2.42")
implementation("com.google.dagger:hilt-android:2.41") implementation("com.google.dagger:hilt-android:2.42")
kapt("com.google.dagger:hilt-compiler:2.41") kapt("com.google.dagger:hilt-compiler:2.42")
// There are a lot of icons // There are a lot of icons
implementation("androidx.compose.material:material-icons-extended:$composeVersion") implementation("androidx.compose.material:material-icons-extended:$composeVersion")
@ -145,7 +145,7 @@ dependencies {
implementation("com.google.accompanist:accompanist-systemuicontroller:0.17.0") implementation("com.google.accompanist:accompanist-systemuicontroller:0.17.0")
// Firebase // Firebase
implementation(platform("com.google.firebase:firebase-bom:29.0.4")) implementation(platform("com.google.firebase:firebase-bom:30.0.0"))
implementation("com.google.firebase:firebase-analytics-ktx") implementation("com.google.firebase:firebase-analytics-ktx")
// Crashlytics and Analytics // Crashlytics and Analytics

View File

@ -1,13 +1,16 @@
package com.sadellie.unitto package com.sadellie.unitto
import android.annotation.SuppressLint
import android.os.Bundle import android.os.Bundle
import androidx.activity.ComponentActivity import androidx.activity.ComponentActivity
import androidx.activity.compose.setContent import androidx.activity.compose.setContent
import androidx.activity.viewModels import androidx.activity.viewModels
import androidx.compose.foundation.layout.padding
import androidx.compose.material3.Scaffold import androidx.compose.material3.Scaffold
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.runtime.collectAsState import androidx.compose.runtime.collectAsState
import androidx.compose.runtime.getValue import androidx.compose.runtime.getValue
import androidx.compose.ui.Modifier
import androidx.navigation.NavHostController import androidx.navigation.NavHostController
import androidx.navigation.NavType import androidx.navigation.NavType
import androidx.navigation.compose.NavHost import androidx.navigation.compose.NavHost
@ -61,8 +64,8 @@ fun UnittoApp(
navController: NavHostController, navController: NavHostController,
viewModel: MainViewModel, viewModel: MainViewModel,
) { ) {
Scaffold { Scaffold { padding ->
NavHost(navController = navController, startDestination = MAIN_SCREEN) { NavHost(modifier = Modifier.padding(padding), navController = navController, startDestination = MAIN_SCREEN) {
composable(MAIN_SCREEN) { composable(MAIN_SCREEN) {
MainScreen( MainScreen(

View File

@ -1,7 +1,7 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules. // Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript { buildscript {
val composeVersion by extra ("1.2.0-alpha08") val composeVersion by extra ("1.2.0-beta01")
repositories { repositories {
google() google()
@ -9,8 +9,8 @@ buildscript {
} }
dependencies { dependencies {
classpath("com.android.tools.build:gradle:7.1.3") classpath("com.android.tools.build:gradle:7.1.3")
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.20") classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.21")
classpath("com.google.dagger:hilt-android-gradle-plugin:2.38.1") classpath("com.google.dagger:hilt-android-gradle-plugin:2.40.1")
// Google services // Google services
classpath("com.google.gms:google-services:4.3.10") classpath("com.google.gms:google-services:4.3.10")