Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion app-compose/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
plugins {
alias(libs.plugins.suwiki.android.application)
alias(libs.plugins.suwiki.android.application.compose)
alias(libs.plugins.suwiki.android.hilt)
alias(libs.plugins.google.services)
alias(libs.plugins.firebase.crashlytics)
alias(libs.plugins.compose.compiler)
Expand All @@ -25,9 +24,11 @@ dependencies {

implementation(projects.remote.openmajor)
implementation(projects.remote.timetable)
implementation(projects.remote.common)

implementation(projects.local.openmajor)
implementation(projects.local.timetable)
implementation(projects.local.common)

implementation(projects.data.openmajor)
implementation(projects.data.timetable)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,21 @@ package com.kunize.uswtimetable
import android.app.Application
import com.suwiki.data.openmajor.di.openMajorRepositoryModule
import com.suwiki.data.timetable.di.timetableRepositoryModule
import com.suwiki.domain.timetable.timetableDomainModule
import com.suwiki.domain.openmajor.di.openMajorUseCaseModule
import com.suwiki.domain.timetable.timetableUseCaseModule
import com.suwiki.local.common.database.di.daoModule
import com.suwiki.local.common.datastore.di.dataStoreModule
import com.suwiki.local.common.database.di.databaseModule
import com.suwiki.local.openmajor.di.localOpenMajorDataSourceModule
import com.suwiki.local.timetable.di.localTimetableDataSourceModule
import com.suwiki.presentation.openmajor.di.openMajorModule
import com.suwiki.presentation.timetable.di.timetableModule
import com.suwiki.presentation.navigator.di.mainViewModelModule
import com.suwiki.presentation.openmajor.di.openMajorViewModelModule
import com.suwiki.presentation.timetable.di.timetableViewModelModule
import com.suwiki.remote.common.di.apiModule
import com.suwiki.remote.common.di.firebaseDatabaseModule
import com.suwiki.remote.common.di.networkModule
import com.suwiki.remote.openmajor.di.remoteOpenMajorApiModule
import com.suwiki.remote.openmajor.di.remoteOpenMajorDataSourceModule
import com.suwiki.remote.timetable.di.remoteTimetableDataSourceModule
import org.koin.android.ext.koin.androidContext
import org.koin.core.context.startKoin
Expand All @@ -20,13 +31,35 @@ class SuwikiApplication : Application() {
startKoin {
androidContext(this@SuwikiApplication)
modules(
remoteTimetableDataSourceModule,
localTimetableDataSourceModule,
timetableRepositoryModule,
// data module
openMajorRepositoryModule,
timetableModule,
openMajorModule,
timetableDomainModule,
timetableRepositoryModule,

// domain module
openMajorUseCaseModule,
timetableUseCaseModule,

// presentation module
mainViewModelModule,
openMajorViewModelModule,
timetableViewModelModule,

// local module
localOpenMajorDataSourceModule,
localTimetableDataSourceModule,
// common
daoModule,
databaseModule,
dataStoreModule,

// remote module
remoteOpenMajorApiModule,
remoteOpenMajorDataSourceModule,
remoteTimetableDataSourceModule,
// common
apiModule,
networkModule,
firebaseDatabaseModule,
)
}
}
Expand Down
4 changes: 0 additions & 4 deletions build-logic/convention/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,6 @@ gradlePlugin {
id = "suwiki.android.library.compose"
implementationClass = "AndroidLibraryComposeConventionPlugin"
}
register("androidHilt") {
id = "suwiki.android.hilt"
implementationClass = "AndroidHiltConventionPlugin"
}
register("javaLibrary") {
id = "suwiki.java.library"
implementationClass = "JavaLibraryConventionPlugin"
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ internal class DataConventionPlugin : Plugin<Project> {
with(target) {
with(pluginManager) {
apply("suwiki.android.library")
apply("suwiki.android.hilt")
}

dependencies {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ internal class PresentationComposeConventionPlugin : Plugin<Project> {
with(pluginManager) {
apply("suwiki.android.library")
apply("suwiki.android.library.compose")
apply("suwiki.android.hilt")
}

dependencies {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ internal class RemoteConventionPlugin : Plugin<Project> {
with(target) {
with(pluginManager) {
apply("suwiki.android.library")
apply("suwiki.android.hilt")
}

dependencies {
Expand Down
1 change: 0 additions & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ plugins {
alias(libs.plugins.kotlin.jvm) apply false
alias(libs.plugins.kotlin.serialization) apply false
alias(libs.plugins.ksp) apply false
alias(libs.plugins.hilt) apply false
alias(libs.plugins.protobuf) apply false
alias(libs.plugins.kotlin.multiplatform) apply false
alias(libs.plugins.android.kotlin.multiplatform.library) apply false
Expand Down
1 change: 0 additions & 1 deletion common/android/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
@Suppress("DSL_SCOPE_VIOLATION") // TODO: Remove once KTIJ-19369 is fixed
plugins {
alias(libs.plugins.suwiki.android.library)
alias(libs.plugins.suwiki.android.hilt)
}

android {
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading
Loading