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
4 changes: 4 additions & 0 deletions build-logic/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -63,5 +63,9 @@ gradlePlugin {
id = "conf.mad.convention.android.feature"
implementationClass = "com.conf.mad.todo.convention.AndroidFeaturePlugin"
}
register("pureKotlin") {
id = "conf.mad.convention.kotlin"
implementationClass = "com.conf.mad.todo.convention.PureKotlinPlugin"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
package com.conf.mad.todo.convention

import com.conf.mad.todo.dsl.implementation
import com.conf.mad.todo.dsl.library
import com.conf.mad.todo.dsl.libs
import org.gradle.api.Plugin
import org.gradle.api.Project
import org.gradle.kotlin.dsl.dependencies

class PureKotlinPlugin : Plugin<Project> {
override fun apply(target: Project) = with(target) {
with(pluginManager) {
apply("java-library")
apply("org.jetbrains.kotlin.jvm")
}
dependencies {
implementation(libs.library("javax-inject"))
implementation(libs.library("kotlinx-coroutines-core"))
}
}
}
1 change: 1 addition & 0 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,6 @@ plugins {
alias(libs.plugins.dagger.hilt) apply false
alias(libs.plugins.ksp) apply false
alias(libs.plugins.junit5) apply false
alias(libs.plugins.kotlin.jvm) apply false
}
true // Needed to make the Suppress annotation work for the plugins block
12 changes: 0 additions & 12 deletions core/model/build.gradle.kts

This file was deleted.

Empty file removed core/model/consumer-rules.pro
Empty file.
2 changes: 0 additions & 2 deletions core/model/src/main/AndroidManifest.xml

This file was deleted.

2 changes: 1 addition & 1 deletion data/task/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@ android {

dependencies {
implementation(projects.core.database)
implementation(projects.core.model)
implementation(projects.domain.task)
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package com.conf.mad.todo.data.task.di

import com.conf.mad.todo.data.task.repository.DefaultTaskRepository
import com.conf.mad.todo.data.task.repository.TaskRepository
import dagger.Binds
import dagger.Module
import dagger.hilt.InstallIn
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.conf.mad.todo.data.task.mapper

import com.conf.mad.todo.database.entity.TaskEntity
import com.conf.mad.todo.model.Task
import com.conf.mad.todo.task.model.Task

fun TaskEntity.asDomain(): Task = Task(
id = id,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ package com.conf.mad.todo.data.task.repository
import com.conf.mad.todo.data.task.mapper.asDomain
import com.conf.mad.todo.data.task.mapper.toEntity
import com.conf.mad.todo.database.TaskDao
import com.conf.mad.todo.model.Task
import com.conf.mad.todo.task.model.Task
import com.conf.mad.todo.task.repository.TaskRepository
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.map
import javax.inject.Inject
Expand Down
File renamed without changes.
4 changes: 4 additions & 0 deletions domain/task/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
@Suppress("DSL_SCOPE_VIOLATION") // TODO: Remove once KTIJ-19369 is fixed
plugins {
id("conf.mad.convention.kotlin")
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.conf.mad.todo.model
package com.conf.mad.todo.task.model

data class Task(
val id: Long,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.conf.mad.todo.data.task.repository
package com.conf.mad.todo.task.repository

import com.conf.mad.todo.model.Task
import com.conf.mad.todo.task.model.Task
import kotlinx.coroutines.flow.Flow

interface TaskRepository {
Expand Down
1 change: 1 addition & 0 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,7 @@ robolectric = { module = "org.robolectric:robolectric", version.ref = "robolectr
android-application = { id = "com.android.application", version.ref = "agp" }
android-library = { id = "com.android.library", version.ref = "agp" }
kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
dagger-hilt = { id = "com.google.dagger.hilt.android", version.ref = "dagger-hilt" }
ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
kotlinx-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
Expand Down
4 changes: 2 additions & 2 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ include(
":app",
":core:database",
":core:designsystem",
":core:model",
":data:task",
":core:ui",
":data:task",
":domain:task",
":feature:home",
":feature:post"
)