From b95666789c0d82960207f318cd3056dbce8ca682 Mon Sep 17 00:00:00 2001 From: Roman Pytkov Date: Thu, 31 Oct 2024 17:19:02 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A0=D0=B5=D1=81=D1=82=D1=80=D1=83=D0=BA?= =?UTF-8?q?=D1=82=D1=83=D1=80=D0=B8=D0=B7=D0=B0=D1=86=D0=B8=D1=8F=20=D0=BF?= =?UTF-8?q?=D1=80=D0=BE=D0=B5=D0=BA=D1=82=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle.kts | 18 ++----- .../{ => app}/ExampleInstrumentedTest.kt | 2 +- .../wallenc/{ => app}/MainActivity.kt | 7 +-- .../wallenc/{ => app}/WallencApplication.kt | 2 +- .../{ => app}/ui/screens/main/MainScreen.kt | 2 +- .../app/ui/screens/main/MainScreenState.kt | 3 ++ .../ui/screens/main/MainViewModel.kt | 2 +- .../{ui => app/ui/screens}/theme/Color.kt | 2 +- .../{ui => app/ui/screens}/theme/Theme.kt | 2 +- .../{ui => app/ui/screens}/theme/Type.kt | 2 +- .../ui/screens/main/MainScreenState.kt | 3 -- .../nullptroma/wallenc/ExampleUnitTest.kt | 17 ------- .../wallenc/app}/ExampleUnitTest.kt | 2 +- build.gradle.kts | 1 + data/build.gradle.kts | 19 +++++++- .../data/ExampleInstrumentedTest.kt | 24 ---------- .../wallenc/data}/ExampleInstrumentedTest.kt | 4 +- .../{ => wallenc}/data/ExampleUnitTest.kt | 2 +- domain/build.gradle.kts | 48 ++----------------- domain/consumer-rules.pro | 0 domain/proguard-rules.pro | 21 -------- domain/src/main/AndroidManifest.xml | 4 -- .../nullptroma/wallenc/domain/MyClass.kt | 4 ++ gradle/libs.versions.toml | 2 + settings.gradle.kts | 2 +- 25 files changed, 49 insertions(+), 146 deletions(-) rename app/src/androidTest/java/com/github/nullptroma/wallenc/{ => app}/ExampleInstrumentedTest.kt (93%) rename app/src/main/java/com/github/nullptroma/wallenc/{ => app}/MainActivity.kt (90%) rename app/src/main/java/com/github/nullptroma/wallenc/{ => app}/WallencApplication.kt (76%) rename app/src/main/java/com/github/nullptroma/wallenc/{ => app}/ui/screens/main/MainScreen.kt (93%) create mode 100644 app/src/main/java/com/github/nullptroma/wallenc/app/ui/screens/main/MainScreenState.kt rename app/src/main/java/com/github/nullptroma/wallenc/{ => app}/ui/screens/main/MainViewModel.kt (80%) rename app/src/main/java/com/github/nullptroma/wallenc/{ui => app/ui/screens}/theme/Color.kt (82%) rename app/src/main/java/com/github/nullptroma/wallenc/{ui => app/ui/screens}/theme/Theme.kt (96%) rename app/src/main/java/com/github/nullptroma/wallenc/{ui => app/ui/screens}/theme/Type.kt (94%) delete mode 100644 app/src/main/java/com/github/nullptroma/wallenc/ui/screens/main/MainScreenState.kt delete mode 100644 app/src/test/java/com/github/nullptroma/wallenc/ExampleUnitTest.kt rename {domain/src/test/java/com/github/nullptroma/domain => app/src/test/java/com/github/nullptroma/wallenc/app}/ExampleUnitTest.kt (88%) delete mode 100644 data/src/androidTest/java/com/github/nullptroma/data/ExampleInstrumentedTest.kt rename {domain/src/androidTest/java/com/github/nullptroma/domain => data/src/androidTest/java/com/github/nullptroma/wallenc/data}/ExampleInstrumentedTest.kt (81%) rename data/src/test/java/com/github/nullptroma/{ => wallenc}/data/ExampleUnitTest.kt (87%) delete mode 100644 domain/consumer-rules.pro delete mode 100644 domain/proguard-rules.pro delete mode 100644 domain/src/main/AndroidManifest.xml create mode 100644 domain/src/main/java/com/github/nullptroma/wallenc/domain/MyClass.kt diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 523e440..2630398 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -7,11 +7,11 @@ plugins { } android { - namespace = "com.github.nullptroma.wallenc" + namespace = "com.github.nullptroma.wallenc.app" compileSdk = 35 defaultConfig { - applicationId = "com.github.nullptroma.wallenc" + applicationId = "com.github.nullptroma.wallenc.app" minSdk = 24 targetSdk = 34 versionCode = 1 @@ -63,18 +63,6 @@ dependencies { implementation(libs.dagger.hilt) ksp(libs.dagger.hilt.compiler) - // Room - implementation(libs.room.ktx) - implementation(libs.room.runtime) - annotationProcessor(libs.room.compiler) - ksp(libs.room.compiler) - - // Retrofit - implementation(libs.retrofit) - implementation(libs.retrofit.converter.gson) - implementation(libs.retrofit.converter.scalars) - implementation(libs.google.gson) - implementation(libs.androidx.core.ktx) implementation(libs.androidx.lifecycle.runtime.ktx) implementation(libs.androidx.activity.compose) @@ -93,6 +81,6 @@ dependencies { androidTestImplementation(platform(libs.androidx.compose.bom)) androidTestImplementation(libs.androidx.ui.test.junit4) - implementation(project(":domain")) implementation(project(":data")) + implementation(project(":domain")) } \ No newline at end of file diff --git a/app/src/androidTest/java/com/github/nullptroma/wallenc/ExampleInstrumentedTest.kt b/app/src/androidTest/java/com/github/nullptroma/wallenc/app/ExampleInstrumentedTest.kt similarity index 93% rename from app/src/androidTest/java/com/github/nullptroma/wallenc/ExampleInstrumentedTest.kt rename to app/src/androidTest/java/com/github/nullptroma/wallenc/app/ExampleInstrumentedTest.kt index 233462b..3a63d74 100644 --- a/app/src/androidTest/java/com/github/nullptroma/wallenc/ExampleInstrumentedTest.kt +++ b/app/src/androidTest/java/com/github/nullptroma/wallenc/app/ExampleInstrumentedTest.kt @@ -1,4 +1,4 @@ -package com.github.nullptroma.wallenc +package com.github.nullptroma.wallenc.app import androidx.test.platform.app.InstrumentationRegistry import androidx.test.ext.junit.runners.AndroidJUnit4 diff --git a/app/src/main/java/com/github/nullptroma/wallenc/MainActivity.kt b/app/src/main/java/com/github/nullptroma/wallenc/app/MainActivity.kt similarity index 90% rename from app/src/main/java/com/github/nullptroma/wallenc/MainActivity.kt rename to app/src/main/java/com/github/nullptroma/wallenc/app/MainActivity.kt index 6266cb4..46d55a1 100644 --- a/app/src/main/java/com/github/nullptroma/wallenc/MainActivity.kt +++ b/app/src/main/java/com/github/nullptroma/wallenc/app/MainActivity.kt @@ -1,4 +1,4 @@ -package com.github.nullptroma.wallenc +package com.github.nullptroma.wallenc.app import android.os.Bundle import android.widget.Toast @@ -18,10 +18,7 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.tooling.preview.Preview -import androidx.hilt.navigation.compose.hiltViewModel -import com.github.nullptroma.wallenc.ui.screens.main.MainScreen -import com.github.nullptroma.wallenc.ui.screens.main.MainViewModel -import com.github.nullptroma.wallenc.ui.theme.WallencTheme +import com.github.nullptroma.wallenc.app.ui.theme.WallencTheme import com.yandex.authsdk.YandexAuthLoginOptions import com.yandex.authsdk.YandexAuthOptions import com.yandex.authsdk.YandexAuthResult diff --git a/app/src/main/java/com/github/nullptroma/wallenc/WallencApplication.kt b/app/src/main/java/com/github/nullptroma/wallenc/app/WallencApplication.kt similarity index 76% rename from app/src/main/java/com/github/nullptroma/wallenc/WallencApplication.kt rename to app/src/main/java/com/github/nullptroma/wallenc/app/WallencApplication.kt index 0769253..a768589 100644 --- a/app/src/main/java/com/github/nullptroma/wallenc/WallencApplication.kt +++ b/app/src/main/java/com/github/nullptroma/wallenc/app/WallencApplication.kt @@ -1,4 +1,4 @@ -package com.github.nullptroma.wallenc +package com.github.nullptroma.wallenc.app import android.app.Application import dagger.hilt.android.HiltAndroidApp diff --git a/app/src/main/java/com/github/nullptroma/wallenc/ui/screens/main/MainScreen.kt b/app/src/main/java/com/github/nullptroma/wallenc/app/ui/screens/main/MainScreen.kt similarity index 93% rename from app/src/main/java/com/github/nullptroma/wallenc/ui/screens/main/MainScreen.kt rename to app/src/main/java/com/github/nullptroma/wallenc/app/ui/screens/main/MainScreen.kt index fb63cb4..7654da3 100644 --- a/app/src/main/java/com/github/nullptroma/wallenc/ui/screens/main/MainScreen.kt +++ b/app/src/main/java/com/github/nullptroma/wallenc/app/ui/screens/main/MainScreen.kt @@ -1,4 +1,4 @@ -package com.github.nullptroma.wallenc.ui.screens.main +package com.github.nullptroma.wallenc.app.ui.screens.main import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column diff --git a/app/src/main/java/com/github/nullptroma/wallenc/app/ui/screens/main/MainScreenState.kt b/app/src/main/java/com/github/nullptroma/wallenc/app/ui/screens/main/MainScreenState.kt new file mode 100644 index 0000000..c91dc4d --- /dev/null +++ b/app/src/main/java/com/github/nullptroma/wallenc/app/ui/screens/main/MainScreenState.kt @@ -0,0 +1,3 @@ +package com.github.nullptroma.wallenc.app.ui.screens.main + +data class MainScreenState(val value: String) \ No newline at end of file diff --git a/app/src/main/java/com/github/nullptroma/wallenc/ui/screens/main/MainViewModel.kt b/app/src/main/java/com/github/nullptroma/wallenc/app/ui/screens/main/MainViewModel.kt similarity index 80% rename from app/src/main/java/com/github/nullptroma/wallenc/ui/screens/main/MainViewModel.kt rename to app/src/main/java/com/github/nullptroma/wallenc/app/ui/screens/main/MainViewModel.kt index faeda3f..37f974c 100644 --- a/app/src/main/java/com/github/nullptroma/wallenc/ui/screens/main/MainViewModel.kt +++ b/app/src/main/java/com/github/nullptroma/wallenc/app/ui/screens/main/MainViewModel.kt @@ -1,4 +1,4 @@ -package com.github.nullptroma.wallenc.ui.screens.main +package com.github.nullptroma.wallenc.app.ui.screens.main import androidx.lifecycle.ViewModel import dagger.hilt.android.lifecycle.HiltViewModel diff --git a/app/src/main/java/com/github/nullptroma/wallenc/ui/theme/Color.kt b/app/src/main/java/com/github/nullptroma/wallenc/app/ui/screens/theme/Color.kt similarity index 82% rename from app/src/main/java/com/github/nullptroma/wallenc/ui/theme/Color.kt rename to app/src/main/java/com/github/nullptroma/wallenc/app/ui/screens/theme/Color.kt index a70ad7b..eeae900 100644 --- a/app/src/main/java/com/github/nullptroma/wallenc/ui/theme/Color.kt +++ b/app/src/main/java/com/github/nullptroma/wallenc/app/ui/screens/theme/Color.kt @@ -1,4 +1,4 @@ -package com.github.nullptroma.wallenc.ui.theme +package com.github.nullptroma.wallenc.app.ui.theme import androidx.compose.ui.graphics.Color diff --git a/app/src/main/java/com/github/nullptroma/wallenc/ui/theme/Theme.kt b/app/src/main/java/com/github/nullptroma/wallenc/app/ui/screens/theme/Theme.kt similarity index 96% rename from app/src/main/java/com/github/nullptroma/wallenc/ui/theme/Theme.kt rename to app/src/main/java/com/github/nullptroma/wallenc/app/ui/screens/theme/Theme.kt index dfff095..9b88026 100644 --- a/app/src/main/java/com/github/nullptroma/wallenc/ui/theme/Theme.kt +++ b/app/src/main/java/com/github/nullptroma/wallenc/app/ui/screens/theme/Theme.kt @@ -1,4 +1,4 @@ -package com.github.nullptroma.wallenc.ui.theme +package com.github.nullptroma.wallenc.app.ui.theme import android.os.Build import androidx.compose.foundation.isSystemInDarkTheme diff --git a/app/src/main/java/com/github/nullptroma/wallenc/ui/theme/Type.kt b/app/src/main/java/com/github/nullptroma/wallenc/app/ui/screens/theme/Type.kt similarity index 94% rename from app/src/main/java/com/github/nullptroma/wallenc/ui/theme/Type.kt rename to app/src/main/java/com/github/nullptroma/wallenc/app/ui/screens/theme/Type.kt index 45b699a..231e445 100644 --- a/app/src/main/java/com/github/nullptroma/wallenc/ui/theme/Type.kt +++ b/app/src/main/java/com/github/nullptroma/wallenc/app/ui/screens/theme/Type.kt @@ -1,4 +1,4 @@ -package com.github.nullptroma.wallenc.ui.theme +package com.github.nullptroma.wallenc.app.ui.theme import androidx.compose.material3.Typography import androidx.compose.ui.text.TextStyle diff --git a/app/src/main/java/com/github/nullptroma/wallenc/ui/screens/main/MainScreenState.kt b/app/src/main/java/com/github/nullptroma/wallenc/ui/screens/main/MainScreenState.kt deleted file mode 100644 index 6159605..0000000 --- a/app/src/main/java/com/github/nullptroma/wallenc/ui/screens/main/MainScreenState.kt +++ /dev/null @@ -1,3 +0,0 @@ -package com.github.nullptroma.wallenc.ui.screens.main - -data class MainScreenState(val value: String) \ No newline at end of file diff --git a/app/src/test/java/com/github/nullptroma/wallenc/ExampleUnitTest.kt b/app/src/test/java/com/github/nullptroma/wallenc/ExampleUnitTest.kt deleted file mode 100644 index cc1c8e0..0000000 --- a/app/src/test/java/com/github/nullptroma/wallenc/ExampleUnitTest.kt +++ /dev/null @@ -1,17 +0,0 @@ -package com.github.nullptroma.wallenc - -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/domain/src/test/java/com/github/nullptroma/domain/ExampleUnitTest.kt b/app/src/test/java/com/github/nullptroma/wallenc/app/ExampleUnitTest.kt similarity index 88% rename from domain/src/test/java/com/github/nullptroma/domain/ExampleUnitTest.kt rename to app/src/test/java/com/github/nullptroma/wallenc/app/ExampleUnitTest.kt index 811a1e1..5aba99d 100644 --- a/domain/src/test/java/com/github/nullptroma/domain/ExampleUnitTest.kt +++ b/app/src/test/java/com/github/nullptroma/wallenc/app/ExampleUnitTest.kt @@ -1,4 +1,4 @@ -package com.github.nullptroma.domain +package com.github.nullptroma.wallenc.app import org.junit.Test diff --git a/build.gradle.kts b/build.gradle.kts index 27ec794..2e23357 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -7,4 +7,5 @@ plugins { alias(libs.plugins.android.library) apply false alias(libs.plugins.dagger.hilt) apply false alias(libs.plugins.ksp) apply false + alias(libs.plugins.jetbrains.kotlin.jvm) apply false } \ No newline at end of file diff --git a/data/build.gradle.kts b/data/build.gradle.kts index dbb75ff..4bff425 100644 --- a/data/build.gradle.kts +++ b/data/build.gradle.kts @@ -6,8 +6,8 @@ plugins { } android { - namespace = "com.github.nullptroma.data" - compileSdk = 35 + namespace = "com.github.nullptroma.wallenc.data" + compileSdk = 34 defaultConfig { minSdk = 24 @@ -35,13 +35,28 @@ android { } dependencies { + // Hilt implementation(libs.dagger.hilt) ksp(libs.dagger.hilt.compiler) + // Room + implementation(libs.room.ktx) + implementation(libs.room.runtime) + annotationProcessor(libs.room.compiler) + ksp(libs.room.compiler) + + // Retrofit + implementation(libs.retrofit) + implementation(libs.retrofit.converter.gson) + implementation(libs.retrofit.converter.scalars) + implementation(libs.google.gson) + implementation(libs.androidx.core.ktx) implementation(libs.androidx.appcompat) implementation(libs.material) testImplementation(libs.junit) androidTestImplementation(libs.androidx.junit) androidTestImplementation(libs.androidx.espresso.core) + + implementation(project(":domain")) } \ No newline at end of file diff --git a/data/src/androidTest/java/com/github/nullptroma/data/ExampleInstrumentedTest.kt b/data/src/androidTest/java/com/github/nullptroma/data/ExampleInstrumentedTest.kt deleted file mode 100644 index 11a3c5f..0000000 --- a/data/src/androidTest/java/com/github/nullptroma/data/ExampleInstrumentedTest.kt +++ /dev/null @@ -1,24 +0,0 @@ -package com.github.nullptroma.data - -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.github.nullptroma.data.test", appContext.packageName) - } -} \ No newline at end of file diff --git a/domain/src/androidTest/java/com/github/nullptroma/domain/ExampleInstrumentedTest.kt b/data/src/androidTest/java/com/github/nullptroma/wallenc/data/ExampleInstrumentedTest.kt similarity index 81% rename from domain/src/androidTest/java/com/github/nullptroma/domain/ExampleInstrumentedTest.kt rename to data/src/androidTest/java/com/github/nullptroma/wallenc/data/ExampleInstrumentedTest.kt index cde98b1..c4dfb88 100644 --- a/domain/src/androidTest/java/com/github/nullptroma/domain/ExampleInstrumentedTest.kt +++ b/data/src/androidTest/java/com/github/nullptroma/wallenc/data/ExampleInstrumentedTest.kt @@ -1,4 +1,4 @@ -package com.github.nullptroma.domain +package com.github.nullptroma.wallenc.data import androidx.test.platform.app.InstrumentationRegistry import androidx.test.ext.junit.runners.AndroidJUnit4 @@ -19,6 +19,6 @@ class ExampleInstrumentedTest { fun useAppContext() { // Context of the app under test. val appContext = InstrumentationRegistry.getInstrumentation().targetContext - assertEquals("com.github.nullptroma.domain.test", appContext.packageName) + assertEquals("com.github.nullptroma.wallenc.data.test", appContext.packageName) } } \ No newline at end of file diff --git a/data/src/test/java/com/github/nullptroma/data/ExampleUnitTest.kt b/data/src/test/java/com/github/nullptroma/wallenc/data/ExampleUnitTest.kt similarity index 87% rename from data/src/test/java/com/github/nullptroma/data/ExampleUnitTest.kt rename to data/src/test/java/com/github/nullptroma/wallenc/data/ExampleUnitTest.kt index aa929e4..057818b 100644 --- a/data/src/test/java/com/github/nullptroma/data/ExampleUnitTest.kt +++ b/data/src/test/java/com/github/nullptroma/wallenc/data/ExampleUnitTest.kt @@ -1,4 +1,4 @@ -package com.github.nullptroma.data +package com.github.nullptroma.wallenc.data import org.junit.Test diff --git a/domain/build.gradle.kts b/domain/build.gradle.kts index d663175..a8c8c10 100644 --- a/domain/build.gradle.kts +++ b/domain/build.gradle.kts @@ -1,47 +1,9 @@ plugins { - alias(libs.plugins.android.library) - alias(libs.plugins.kotlin.android) - alias(libs.plugins.dagger.hilt) - alias(libs.plugins.ksp) + id("java-library") + alias(libs.plugins.jetbrains.kotlin.jvm) } -android { - namespace = "com.github.nullptroma.domain" - compileSdk = 35 - - defaultConfig { - minSdk = 24 - - testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" - consumerProguardFiles("consumer-rules.pro") - } - - buildTypes { - release { - isMinifyEnabled = false - proguardFiles( - getDefaultProguardFile("proguard-android-optimize.txt"), - "proguard-rules.pro" - ) - } - } - compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 - } - kotlinOptions { - jvmTarget = "1.8" - } -} - -dependencies { - implementation(libs.dagger.hilt) - ksp(libs.dagger.hilt.compiler) - - implementation(libs.androidx.core.ktx) - implementation(libs.androidx.appcompat) - implementation(libs.material) - testImplementation(libs.junit) - androidTestImplementation(libs.androidx.junit) - androidTestImplementation(libs.androidx.espresso.core) +java { + sourceCompatibility = JavaVersion.VERSION_21 + targetCompatibility = JavaVersion.VERSION_21 } \ No newline at end of file diff --git a/domain/consumer-rules.pro b/domain/consumer-rules.pro deleted file mode 100644 index e69de29..0000000 diff --git a/domain/proguard-rules.pro b/domain/proguard-rules.pro deleted file mode 100644 index 481bb43..0000000 --- a/domain/proguard-rules.pro +++ /dev/null @@ -1,21 +0,0 @@ -# Add project specific ProGuard rules here. -# You can control the set of applied configuration files using the -# proguardFiles setting in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} - -# Uncomment this to preserve the line number information for -# debugging stack traces. -#-keepattributes SourceFile,LineNumberTable - -# If you keep the line number information, uncomment this to -# hide the original source file name. -#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/domain/src/main/AndroidManifest.xml b/domain/src/main/AndroidManifest.xml deleted file mode 100644 index a5918e6..0000000 --- a/domain/src/main/AndroidManifest.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/domain/src/main/java/com/github/nullptroma/wallenc/domain/MyClass.kt b/domain/src/main/java/com/github/nullptroma/wallenc/domain/MyClass.kt new file mode 100644 index 0000000..2a3e089 --- /dev/null +++ b/domain/src/main/java/com/github/nullptroma/wallenc/domain/MyClass.kt @@ -0,0 +1,4 @@ +package com.github.nullptroma.wallenc.domain + +class MyClass { +} \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index ba25c52..389c18a 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -18,6 +18,7 @@ retrofit = "2.9.0" gson = "2.10.1" appcompat = "1.7.0" material = "1.12.0" +jetbrainsKotlinJvm = "2.0.20" [libraries] navigation = { group = "androidx.navigation", name = "navigation-compose", version.ref = "navigation" } @@ -67,4 +68,5 @@ compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = " dagger-hilt = { id = "com.google.dagger.hilt.android", version.ref = "daggerHilt" } ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" } android-library = { id = "com.android.library", version.ref = "agp" } +jetbrains-kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "jetbrainsKotlinJvm" } diff --git a/settings.gradle.kts b/settings.gradle.kts index edb7ac5..9a05bb0 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -21,5 +21,5 @@ dependencyResolutionManagement { rootProject.name = "Wallenc" include(":app") -include(":domain") include(":data") +include(":domain")