Skip to content

Commit 7088f14

Browse files
Update build.gradle.kts for Gradle 8.x compatibility
1 parent 197e880 commit 7088f14

File tree

1 file changed

+30
-35
lines changed

1 file changed

+30
-35
lines changed

core/app/build.gradle.kts

Lines changed: 30 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
@file:Suppress("UnstableApiUsage")
22

33
import com.tom.rv2ide.build.config.BuildConfig
4-
import com.tom.rv2ide.desugaring.utils.JavaIOReplacements.applyJavaIOReplacements
54
import com.tom.rv2ide.plugins.AndroidIDEAssetsPlugin
6-
import java.util.Properties
5+
import com.android.build.api.variant.ApplicationAndroidComponentsExtension
6+
import com.android.build.gradle.internal.api.BaseVariantOutputImpl
77

88
plugins {
99
id("com.tom.rv2ide.core-app")
@@ -20,20 +20,22 @@ apply { plugin(AndroidIDEAssetsPlugin::class.java) }
2020

2121
android {
2222
namespace = BuildConfig.packageName
23+
compileSdk = 34
2324

2425
defaultConfig {
2526
applicationId = BuildConfig.packageName
26-
vectorDrawables.useSupportLibrary = true
2727
minSdk = 24
2828
targetSdk = 34
2929
versionCode = 1
3030
versionName = "1.0.0"
31+
vectorDrawables.useSupportLibrary = true
3132
}
3233

33-
// FIX: Configuration error rokne ke liye
34-
variantFilter {
35-
if (buildType.name == "debug") {
36-
setIgnore(true)
34+
// Modern variant filtering for Gradle 8.x+
35+
val androidComponents = extensions.getByType(ApplicationAndroidComponentsExtension::class.java)
36+
androidComponents.beforeVariants { variantBuilder ->
37+
if (variantBuilder.buildType == "debug") {
38+
variantBuilder.enable = false
3739
}
3840
}
3941

@@ -56,9 +58,6 @@ android {
5658
}
5759

5860
buildTypes {
59-
debug {
60-
signingConfig = signingConfigs.getByName("custom")
61-
}
6261
release {
6362
isMinifyEnabled = false
6463
signingConfig = signingConfigs.getByName("custom")
@@ -68,9 +67,9 @@ android {
6867
applicationVariants.all {
6968
val variant = this
7069
variant.outputs.all {
71-
val output = this as com.android.build.gradle.internal.api.BaseVariantOutputImpl
72-
val archSuffix = output.getFilter(com.android.build.OutputFile.ABI) ?: "universal"
73-
output.outputFileName = "android-code-studio-${archSuffix}-${variant.versionName}.apk"
70+
val output = this as BaseVariantOutputImpl
71+
val abi = output.getFilter("ABI") ?: "universal"
72+
output.outputFileName = "android-code-studio-${abi}-${variant.versionName}.apk"
7473
}
7574
}
7675

@@ -79,45 +78,41 @@ android {
7978
dataBinding = true
8079
}
8180

82-
lint { abortOnError = false }
81+
lint {
82+
abortOnError = false
83+
}
8384
}
8485

85-
86-
8786
dependencies {
88-
// Basic Dependencies
87+
// Kotlin & Serialization
8988
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.0")
9089
implementation("org.apache.commons:commons-compress:1.21")
90+
implementation("org.tukaani:xz:1.9")
9191

92-
// External & Composite
93-
implementation(projects.external.acsprovider)
94-
implementation(projects.external.atc)
95-
implementation(projects.external.logwire)
96-
implementation(libs.composite.appintro)
97-
implementation(libs.composite.desugaringCore)
98-
99-
// Core Modules
92+
// Core IDE & Tooling
10093
implementation(projects.core.projectdata)
10194
implementation(projects.core.actions)
10295
implementation(projects.core.common)
10396
implementation(projects.core.projects)
97+
implementation(projects.tooling.api)
98+
implementation(projects.tooling.impl)
10499

105-
// Editor & UI
100+
// External & UI
101+
implementation("com.github.Dimezis:BlurView:version-3.2.0")
102+
implementation("androidx.security:security-crypto:1.1.0-alpha06")
106103
implementation(libs.common.editor)
107104
implementation(libs.common.glide)
108105
implementation(libs.google.material)
109-
110-
// Git & Tooling
111-
implementation(libs.git.jgit)
112-
implementation(projects.tooling.api)
113-
114-
// All other legacy deps
115106
implementation(libs.androidx.appcompat)
116107
implementation(libs.androidx.recyclerview)
117108
implementation(libs.androidx.work.ktx)
118-
implementation(libs.google.gson)
119-
implementation(libs.google.guava)
120109

121-
// AI Integration
110+
// AI & Git
122111
implementation("com.google.ai.client.generativeai:generativeai:0.9.0")
112+
implementation(libs.git.jgit)
113+
114+
// Annotation Processors
115+
kapt(libs.common.glide.ap)
116+
kapt(libs.google.auto.service)
117+
kapt(projects.annotation.processors)
123118
}

0 commit comments

Comments
 (0)