diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 7a726f2..eee54e9 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -87,7 +87,6 @@ android { freeCompilerArgs += freeCompilerArgList } } - } dependencies { @@ -95,7 +94,13 @@ dependencies { Kotlin.list.forEach(::api) Compose.list.forEach(::api) - Di.list.forEach(::api) + + with(Di) { + implementation(hiltAndroid) + implementation(hiltNavigationCompose) + ksp(hiltCompiler) + ksp(hiltAndroidCompiler) + } coreLibraryDesugaring(ThirdParty.desugaring) api(Androidx.splash) diff --git a/app/src/androidTest/java/com/lifting/app/ExampleInstrumentedTest.kt b/app/src/androidTest/java/com/lifting/app/ExampleInstrumentedTest.kt deleted file mode 100644 index 84ffb80..0000000 --- a/app/src/androidTest/java/com/lifting/app/ExampleInstrumentedTest.kt +++ /dev/null @@ -1,24 +0,0 @@ -package com.lifting.app - -import androidx.test.platform.app.InstrumentationRegistry -import androidx.test.ext.junit.runners.AndroidJUnit4 - -import org.junit.Test -import org.junit.runner.RunWith - -import org.junit.Assert.* - -/** - * Instrumented test, which will execute on an Android device. - * - * See [testing documentation](http://d.android.com/tools/testing). - */ -@RunWith(AndroidJUnit4::class) -class ExampleInstrumentedTest { - @Test - fun useAppContext() { - // Context of the app under test. - val appContext = InstrumentationRegistry.getInstrumentation().targetContext - assertEquals("com.example.deneme", appContext.packageName) - } -} \ No newline at end of file diff --git a/app/src/main/java/com/lifting/app/MainActivity.kt b/app/src/main/java/com/lifting/app/MainActivity.kt index 6c5d09d..3715051 100644 --- a/app/src/main/java/com/lifting/app/MainActivity.kt +++ b/app/src/main/java/com/lifting/app/MainActivity.kt @@ -3,12 +3,14 @@ package com.lifting.app import android.os.Bundle import androidx.activity.ComponentActivity import androidx.activity.compose.setContent +import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen import dagger.hilt.android.AndroidEntryPoint @AndroidEntryPoint class MainActivity : ComponentActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) + installSplashScreen() setContent { } diff --git a/app/src/test/java/com/lifting/app/ExampleUnitTest.kt b/app/src/test/java/com/lifting/app/ExampleUnitTest.kt deleted file mode 100644 index f9aeab4..0000000 --- a/app/src/test/java/com/lifting/app/ExampleUnitTest.kt +++ /dev/null @@ -1,17 +0,0 @@ -package com.lifting.app - -import org.junit.Test - -import org.junit.Assert.* - -/** - * Example local unit test, which will execute on the development machine (host). - * - * See [testing documentation](http://d.android.com/tools/testing). - */ -class ExampleUnitTest { - @Test - fun addition_isCorrect() { - assertEquals(4, 2 + 2) - } -} \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts index 05818ee..9d3a83a 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -12,7 +12,7 @@ buildscript { } } plugins { - id("com.google.devtools.ksp") version "1.9.0-1.0.13" apply false + id("com.google.devtools.ksp") version "1.9.22-1.0.17" apply false id("org.jetbrains.kotlin.jvm") version "1.9.22" apply false id("com.android.library") version "8.1.0" apply false id("org.jetbrains.kotlin.android") version "1.9.22" apply false diff --git a/buildSrc/src/main/java/Versions.kt b/buildSrc/src/main/java/Versions.kt index 6faa252..44148ba 100644 --- a/buildSrc/src/main/java/Versions.kt +++ b/buildSrc/src/main/java/Versions.kt @@ -1,7 +1,7 @@ object Versions { //Root Build Plugins - const val gradleVersion = "8.1.0" + const val gradleVersion = "8.4.0" const val kotlinGradlePluginVersion = "1.9.0" const val hiltAndroidPluginVersion = "2.48" @@ -11,13 +11,13 @@ object Versions { //Core - const val coreKtxVersion = "1.10.1" + const val coreKtxVersion = "1.13.1" const val platformKotlinBomVersion = "1.8.0" - const val lifecycleRuntimeKtxVersion = "2.6.1" - const val activityComposeVersion = "1.7.2" - const val platformComposeBomVersion = "2022.10.00" - const val material3Version = "1.1.2" - const val foundationVersion = "1.4.3" + const val lifecycleRuntimeKtxVersion = "2.7.0" + const val activityComposeVersion = "1.9.0" + const val platformComposeBomVersion = "2024.05.00" + const val material3Version = "1.2.1" + const val foundationVersion = "1.7.0-alpha07" //Test const val junitVersion = "4.13.2" @@ -27,12 +27,12 @@ object Versions { //Viewmodel - const val lifecycleViewmodelComposeVersion = "2.6.1" - const val lifecycleViewmodelKtxVersion = "2.6.1" + const val lifecycleViewmodelComposeVersion = "2.8.0" + const val lifecycleViewmodelKtxVersion = "2.8.0" //Coroutines - const val coroutinesCoreVersion = "1.6.4" - const val coroutinesAndroidVersion = "1.6.4" + const val coroutinesCoreVersion = "1.7.1" + const val coroutinesAndroidVersion = "1.7.1" //Retrofit - OkHttp3 const val retrofitVersion = "2.9.0" @@ -41,7 +41,7 @@ object Versions { const val okhttpInterceptorVersion = "5.0.0-alpha.2" //Navigation - const val composeNavigationVersion = "2.7.4" + const val composeNavigationVersion = "2.8.0-alpha08" //Splash API const val splashScreenVersion = "1.0.1" @@ -49,8 +49,8 @@ object Versions { //Dagger - Hilt const val hiltAndroidVersion = "2.48" const val hiltAndroidCompilerVersion = "2.48" - const val hiltNavigationComposeVersion = "1.1.0-alpha01" - const val hiltCompilerVersion = "1.0.0" + const val hiltNavigationComposeVersion = "1.2.0" + const val hiltCompilerVersion = "1.2.0" //Datastore const val datastoreVersion = "1.0.0" @@ -77,7 +77,7 @@ object Versions { const val chartVersion = "3.1.0" //Room - const val roomVersion = "2.5.2" + const val roomVersion = "2.6.1" //Calendar const val calendarVersion = "2.4.0" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 2293158..91cbeda 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Sat Jun 10 02:04:20 TRT 2023 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists