Skip to content

Commit 72fd341

Browse files
committed
update librery
1 parent 068314c commit 72fd341

File tree

5 files changed

+14
-29
lines changed

5 files changed

+14
-29
lines changed

build.gradle.kts

+2-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ buildscript {
22
val kotlinVersion by extra("1.9.21")
33
repositories {
44
google()
5-
jcenter()
65
mavenCentral()
76
maven(url = "https://jitpack.io")
87
}
@@ -14,8 +13,8 @@ buildscript {
1413
}
1514
// Top-level build file where you can add configuration options common to all sub-projects/modules.
1615
plugins {
17-
id("com.android.application") version "8.2.0" apply false
18-
id("com.android.library") version "8.2.0" apply false
16+
id("com.android.application") version "8.1.3" apply false
17+
id("com.android.library") version "8.1.3" apply false
1918
id("org.jetbrains.kotlin.android") version "1.9.21" apply false
2019
id("org.jetbrains.kotlin.jvm") version "1.9.21" apply false
2120
id("com.google.dagger.hilt.android") version "2.46.1" apply false

buildSrc/src/main/kotlin/Dependencies.kt

+10-10
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,15 @@ package com.example.androidbase.presentation
44
object Dependencies {
55
const val NAVIGATION_VERSION = "2.7.5"
66
const val ANDROID_MATERIAL = "com.google.android.material:material:1.9.0"
7-
const val ANDROIDX_ACTIVITY = "androidx.activity:activity-ktx:1.6.1"
7+
const val ANDROIDX_ACTIVITY = "androidx.activity:activity-ktx:1.8.2"
88
const val ANDROIDX_APPCOMPAT = "androidx.appcompat:appcompat:1.6.1"
99
const val ANDROIDX_CONSTRAINT_LAYOUT = "androidx.constraintlayout:constraintlayout:2.1.4"
10-
const val ANDROIDX_CORE_KTX = "androidx.core:core-ktx:1.9.0"
11-
const val ANDROIDX_FRAGMENT = "androidx.fragment:fragment-ktx:1.6.1"
12-
const val ANDROIDX_LIFECYCLE = "androidx.lifecycle:lifecycle-runtime-ktx:2.5.1"
10+
const val ANDROIDX_CORE_KTX = "androidx.core:core-ktx:1.12.0"
11+
const val ANDROIDX_FRAGMENT = "androidx.fragment:fragment-ktx:1.6.2"
12+
const val ANDROIDX_LIFECYCLE = "androidx.lifecycle:lifecycle-runtime-ktx:2.6.2"
1313
const val ANDROIDX_LIFECYCLE_EXTENSIONS = "androidx.lifecycle:lifecycle-extensions:2.2.0"
14+
const val VIEW_MODEL = "androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.2"
15+
const val LIVE_DATA = "androidx.lifecycle:lifecycle-livedata-ktx:2.6.2"
1416
const val CARDVIEW = "androidx.cardview:cardview:1.0.0"
1517
const val DRAWER_LAYOUT = "androidx.drawerlayout:drawerlayout:1.2.0"
1618
const val DAGGER_HILT = "com.google.dagger:hilt-android:2.46.1"
@@ -25,17 +27,15 @@ object Dependencies {
2527
const val MOSHI_CODEGEN = "com.squareup.moshi:moshi-kotlin-codegen:1.11.0"
2628
const val NAVIGATION_FRAGMENT = "androidx.navigation:navigation-fragment-ktx:$NAVIGATION_VERSION"
2729
const val NAVIGATION_UI = "androidx.navigation:navigation-ui-ktx:$NAVIGATION_VERSION"
28-
const val PAGING = "androidx.paging:paging-runtime:3.0.0-beta02"
30+
const val PAGING = "androidx.paging:paging-runtime:3.2.1"
2931
const val RECYCLERVIEW = "androidx.recyclerview:recyclerview:3.0.0-beta02"
3032
const val RETROFIT = "com.squareup.retrofit2:retrofit:2.9.0"
3133
const val RETROFIT_INTERCEPTOR = "com.squareup.okhttp3:logging-interceptor:5.0.0-alpha.2"
3234
const val RETROFIT_CONVERTER_MOSHI = "com.squareup.retrofit2:converter-moshi:2.9.0"
3335
const val RETROFIT_CONVERTER_GSON = "com.squareup.retrofit2:converter-gson:2.9.0"
34-
const val ROOM = "androidx.room:room-runtime:2.6.0-rc01"
35-
const val ROOM_COMPILER = "androidx.room:room-compiler:2.6.0-rc01"
36-
const val ROOM_KOTLIN_EXTENSION = "androidx.room:room-ktx:2.6.0-rc01"
37-
const val VIEW_MODEL = "androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.2"
38-
const val LIVE_DATA = "androidx.lifecycle:lifecycle-livedata-ktx:2.6.2"
36+
const val ROOM = "androidx.room:room-runtime:2.6.1"
37+
const val ROOM_COMPILER = "androidx.room:room-compiler:2.6.1"
38+
const val ROOM_KOTLIN_EXTENSION = "androidx.room:room-ktx:2.6.1"
3939
const val TEST_JUNIT = "androidx.test.ext:junit:1.1.4"
4040
const val JUNIT_JUNIT = "junit:junit:4.13.2"
4141
const val TEST_EXPRESO = "androidx.test.espresso:espresso-core:3.5.0"

gradle.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# http://www.gradle.org/docs/current/userguide/build_environment.html
77
# Specifies the JVM arguments used for the daemon process.
88
# The setting is particularly useful for tweaking memory settings.
9-
org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
9+
org.gradle.jvmargs=-Xmx4048m -Dfile.encoding=UTF-8
1010
# When configured, Gradle will run in incubating parallel mode.
1111
# This option should only be used with decoupled projects. More details, visit
1212
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects

presentation/src/main/java/com/example/presentation/ui/home/HomeFragment.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ class HomeFragment : Fragment() {
3535
savedInstanceState: Bundle?
3636
): View? {
3737
// Inflate the layout for this fragment
38-
return inflater.inflate(R.layout.fragment_home2, container, false)
38+
return inflater.inflate(R.layout.fragment_home, container, false)
3939
}
4040

4141
companion object {

presentation/src/main/res/layout/fragment_home2.xml

-14
This file was deleted.

0 commit comments

Comments
 (0)