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
2 changes: 1 addition & 1 deletion Prezel/app/.gitignore
Original file line number Diff line number Diff line change
@@ -1 +1 @@
/build
/build
56 changes: 3 additions & 53 deletions Prezel/app/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,64 +1,14 @@
plugins {
alias(libs.plugins.android.application)
alias(libs.plugins.kotlin.android)
alias(libs.plugins.kotlin.compose)
alias(libs.plugins.ktlint)
alias(libs.plugins.prezel.android.application)
alias(libs.plugins.prezel.android.application.compose)
}

android {
namespace = "com.team.prezel"
compileSdk {
version = release(36)
}

defaultConfig {
applicationId = "com.team.prezel"
minSdk = 28
targetSdk = 36
versionCode = 1
versionName = "1.0"

testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
}

buildTypes {
release {
isMinifyEnabled = false
proguardFiles(
getDefaultProguardFile("proguard-android-optimize.txt"),
"proguard-rules.pro",
)
}
}
compileOptions {
sourceCompatibility = JavaVersion.VERSION_21
targetCompatibility = JavaVersion.VERSION_21
}
buildFeatures {
compose = true
}
}

kotlin {
compilerOptions {
jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_21)
}
}

dependencies {
implementation(libs.androidx.activity.ktx)
implementation(libs.androidx.core.ktx)
implementation(libs.androidx.lifecycle.runtime.ktx)
implementation(libs.androidx.activity.compose)
implementation(platform(libs.androidx.compose.bom))
implementation(libs.androidx.compose.ui)
implementation(libs.androidx.compose.ui.graphics)
implementation(libs.androidx.compose.ui.tooling.preview)
implementation(libs.androidx.compose.material3)
testImplementation(libs.junit)
androidTestImplementation(libs.androidx.junit)
androidTestImplementation(libs.androidx.espresso.core)
androidTestImplementation(platform(libs.androidx.compose.bom))
androidTestImplementation(libs.androidx.compose.ui.test.junit4)
debugImplementation(libs.androidx.compose.ui.tooling)
debugImplementation(libs.androidx.compose.ui.test.manifest)
}
2 changes: 1 addition & 1 deletion Prezel/app/proguard-rules.pro
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@

# If you keep the line number information, uncomment this to
# hide the original source file name.
#-renamesourcefileattribute SourceFile
#-renamesourcefileattribute SourceFile
3 changes: 1 addition & 2 deletions Prezel/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools">
<manifest xmlns:android="http://schemas.android.com/apk/res/android">

<application
android:allowBackup="true"
Expand Down
2 changes: 1 addition & 1 deletion Prezel/app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<resources>
<string name="app_name">Prezel</string>
</resources>
</resources>
1 change: 1 addition & 0 deletions Prezel/build-logic/convention/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/build
80 changes: 80 additions & 0 deletions Prezel/build-logic/convention/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
import org.jetbrains.kotlin.gradle.dsl.JvmTarget

plugins {
`kotlin-dsl`
}

group = "com.team.prezel.buildlogic.convention"

java {
sourceCompatibility = JavaVersion.VERSION_21
targetCompatibility = JavaVersion.VERSION_21
}

kotlin {
compilerOptions {
jvmTarget = JvmTarget.JVM_21
}
}

dependencies {
compileOnly(libs.android.gradleApiPlugin)
compileOnly(libs.compose.gradlePlugin)
compileOnly(libs.kotlin.gradlePlugin)
compileOnly(libs.ksp.gradlePlugin)
}

gradlePlugin {
plugins {
register("androidApplicationCompose") {
id = libs.plugins.prezel.android.application.compose
.get()
.pluginId
implementationClass = "com.team.prezel.buildlogic.convention.plugin.AndroidApplicationComposeConventionPlugin"
}
register("androidApplication") {
id = libs.plugins.prezel.android.application
.asProvider()
.get()
.pluginId
implementationClass = "com.team.prezel.buildlogic.convention.plugin.AndroidApplicationConventionPlugin"
}
register("androidLibraryCompose") {
id = libs.plugins.prezel.android.library.compose
.get()
.pluginId
implementationClass = "com.team.prezel.buildlogic.convention.plugin.AndroidLibraryComposeConventionPlugin"
}
register("androidLibrary") {
id = libs.plugins.prezel.android.library
.asProvider()
.get()
.pluginId
implementationClass = "com.team.prezel.buildlogic.convention.plugin.AndroidLibraryConventionPlugin"
}
register("androidFeatureImpl") {
id = libs.plugins.prezel.android.feature.impl
.get()
.pluginId
implementationClass = "com.team.prezel.buildlogic.convention.plugin.AndroidFeatureImplConventionPlugin"
}
register("androidFeatureApi") {
id = libs.plugins.prezel.android.feature.api
.get()
.pluginId
implementationClass = "com.team.prezel.buildlogic.convention.plugin.AndroidFeatureApiConventionPlugin"
}
register("hilt") {
id = libs.plugins.prezel.hilt
.get()
.pluginId
implementationClass = "com.team.prezel.buildlogic.convention.plugin.HiltConventionPlugin"
}
register("jvmLibrary") {
id = libs.plugins.prezel.jvm.library
.get()
.pluginId
implementationClass = "com.team.prezel.buildlogic.convention.plugin.JvmLibraryConventionPlugin"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
package com.team.prezel.buildlogic.convention

import com.android.build.api.dsl.CommonExtension
import org.gradle.api.Project
import org.gradle.kotlin.dsl.dependencies

/**
* Configure Compose-specific options
*/
internal fun Project.configureAndroidCompose(commonExtension: CommonExtension<*, *, *, *, *, *>) {
commonExtension.apply {
buildFeatures {
compose = true
}

dependencies {
val bom = libs.findLibrary("androidx-compose-bom").get()
"implementation"(platform(bom))
"implementation"(libs.findBundle("android-compose").get())
"androidTestImplementation"(platform(bom))
"implementation"(libs.findLibrary("androidx-compose-ui-tooling-preview").get())
"debugImplementation"(libs.findLibrary("androidx-compose-ui-tooling").get())
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
package com.team.prezel.buildlogic.convention

import com.android.build.api.dsl.CommonExtension
import org.gradle.api.JavaVersion
import org.gradle.api.Project
import org.gradle.api.plugins.JavaPluginExtension
import org.gradle.kotlin.dsl.configure
import org.gradle.kotlin.dsl.dependencies
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
import org.jetbrains.kotlin.gradle.dsl.KotlinAndroidProjectExtension
import org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension
import org.jetbrains.kotlin.gradle.dsl.KotlinVersion

/**
* Configure base Kotlin with Android options
*/
internal fun Project.configureKotlinAndroid(commonExtension: CommonExtension<*, *, *, *, *, *>) {
commonExtension.apply {
compileSdk = 36

defaultConfig {
minSdk = 29
}

compileOptions {
sourceCompatibility = JavaVersion.VERSION_21
targetCompatibility = JavaVersion.VERSION_21
isCoreLibraryDesugaringEnabled = true
}
}

extensions.configure<KotlinAndroidProjectExtension> {
compilerOptions.apply {
languageVersion.set(KotlinVersion.KOTLIN_2_3)
coreLibrariesVersion = libs.findVersion("kotlin").get().toString()
jvmTarget.set(JvmTarget.JVM_21)
allWarningsAsErrors.set(false)
freeCompilerArgs.add("-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi")
freeCompilerArgs.add("-Xconsistent-data-class-copy-visibility")
}
}

dependencies {
"coreLibraryDesugaring"(libs.findLibrary("desugarJdk-libs").get())
}
Comment thread
coderabbitai[bot] marked this conversation as resolved.
}

/**
* Configure base Kotlin options for JVM (non-Android)
*/
internal fun Project.configureKotlinJvm() {
extensions.configure<JavaPluginExtension> {
sourceCompatibility = JavaVersion.VERSION_21
targetCompatibility = JavaVersion.VERSION_21
}

extensions.configure<KotlinJvmProjectExtension> {
compilerOptions.apply {
languageVersion.set(KotlinVersion.KOTLIN_2_3)
coreLibrariesVersion = libs.findVersion("kotlin").get().toString()
jvmTarget.set(JvmTarget.JVM_21)
allWarningsAsErrors.set(false)
freeCompilerArgs.add("-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi")
freeCompilerArgs.add("-Xconsistent-data-class-copy-visibility")
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
package com.team.prezel.buildlogic.convention

import org.gradle.api.Project
import org.gradle.api.artifacts.VersionCatalog
import org.gradle.api.artifacts.VersionCatalogsExtension
import org.gradle.kotlin.dsl.getByType

val Project.libs
get(): VersionCatalog = extensions.getByType<VersionCatalogsExtension>().named("libs")
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
package com.team.prezel.buildlogic.convention.plugin

import com.android.build.api.dsl.ApplicationExtension
import com.team.prezel.buildlogic.convention.configureAndroidCompose
import org.gradle.api.Plugin
import org.gradle.api.Project
import org.gradle.kotlin.dsl.apply
import org.gradle.kotlin.dsl.getByType

class AndroidApplicationComposeConventionPlugin : Plugin<Project> {
override fun apply(target: Project) {
with(target) {
apply(plugin = "org.jetbrains.kotlin.plugin.compose")
apply(plugin = "prezel.android.application")

val extension = extensions.getByType<ApplicationExtension>()
configureAndroidCompose(extension)
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
package com.team.prezel.buildlogic.convention.plugin

import com.android.build.api.dsl.ApplicationExtension
import com.team.prezel.buildlogic.convention.configureKotlinAndroid
import org.gradle.api.Plugin
import org.gradle.api.Project
import org.gradle.kotlin.dsl.apply
import org.gradle.kotlin.dsl.configure

class AndroidApplicationConventionPlugin : Plugin<Project> {
override fun apply(target: Project) {
with(target) {
apply(plugin = "com.android.application")
apply(plugin = "org.jetbrains.kotlin.android")

extensions.configure<ApplicationExtension> {
configureKotlinAndroid(this)
defaultConfig.targetSdk = 36
testOptions.animationsDisabled = true
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
package com.team.prezel.buildlogic.convention.plugin

import org.gradle.api.Plugin
import org.gradle.api.Project
import org.gradle.kotlin.dsl.apply
import org.gradle.kotlin.dsl.dependencies

class AndroidFeatureApiConventionPlugin : Plugin<Project> {
override fun apply(target: Project) {
with(target) {
apply(plugin = "prezel.android.library")
apply(plugin = "org.jetbrains.kotlin.plugin.serialization")

dependencies {
// "api"(project(":core:navigation"))
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
package com.team.prezel.buildlogic.convention.plugin

import com.android.build.api.dsl.LibraryExtension
import com.team.prezel.buildlogic.convention.libs
import org.gradle.api.Plugin
import org.gradle.api.Project
import org.gradle.kotlin.dsl.apply
import org.gradle.kotlin.dsl.configure
import org.gradle.kotlin.dsl.dependencies

class AndroidFeatureImplConventionPlugin : Plugin<Project> {
override fun apply(target: Project) {
with(target) {
apply(plugin = "prezel.android.library")
apply(plugin = "prezel.hilt")

extensions.configure<LibraryExtension> {
testOptions.animationsDisabled = true
}

dependencies {
// "implementation"(project(":core:ui"))
// "implementation"(project(":core:designsystem"))

"implementation"(libs.findLibrary("androidx.lifecycle.runtimeCompose").get())
"implementation"(libs.findLibrary("androidx.lifecycle.viewModelCompose").get())

"androidTestImplementation"(
libs.findLibrary("androidx.lifecycle.runtimeTesting").get(),
)
}
}
}
}
Loading