Skip to content

Commit 94fcc84

Browse files
authored
Merge pull request #1301 from DimensionDev/feature/fdroid_build
update build to fit fdroid rule
2 parents a5dbb75 + 2112fd7 commit 94fcc84

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

app/build.gradle.kts

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,31 @@
1-
1+
// START Non-FOSS component
22
import com.google.firebase.crashlytics.buildtools.gradle.CrashlyticsPlugin
3+
// END Non-FOSS component
34
import com.google.gms.googleservices.GoogleServicesPlugin
45
import java.util.Properties
56
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
67

78
plugins {
8-
alias(libs.plugins.android.application)
9+
id("com.android.application")
910
alias(libs.plugins.kotlin.android)
1011
alias(libs.plugins.ksp)
1112
alias(libs.plugins.kotlin.serialization)
1213
alias(libs.plugins.ktorfit)
1314
alias(libs.plugins.ktlint)
1415
alias(libs.plugins.google.services) apply false
16+
// START Non-FOSS component
1517
alias(libs.plugins.firebase.crashlytics) apply false
18+
// END Non-FOSS component
1619
alias(libs.plugins.compose.compiler)
1720
id("kotlin-parcelize")
1821
}
1922

23+
// START Non-FOSS component
2024
if (project.file("google-services.json").exists()) {
2125
apply<GoogleServicesPlugin>()
2226
apply<CrashlyticsPlugin>()
2327
}
28+
// END Non-FOSS component
2429

2530
android {
2631
namespace = "dev.dimension.flare"
@@ -135,7 +140,6 @@ dependencies {
135140
implementation(libs.androidx.window)
136141
coreLibraryDesugaring(libs.desugar.jdk.libs)
137142
implementation(libs.compose.webview)
138-
implementation(libs.kotlinx.coroutines.play.services)
139143
implementation(projects.shared)
140144
implementation(projects.shared.ui)
141145
implementation(projects.composeUi)
@@ -151,11 +155,14 @@ dependencies {
151155
implementation(libs.haze)
152156
implementation(libs.haze.materials)
153157

158+
// START Non-FOSS component
154159
if (project.file("google-services.json").exists()) {
155160
implementation(platform(libs.firebase.bom))
156161
implementation(libs.firebase.crashlytics.ktx)
157162
implementation(libs.firebase.analytics.ktx)
163+
implementation(libs.kotlinx.coroutines.play.services)
158164
}
165+
// END Non-FOSS component
159166

160167
testImplementation(libs.junit)
161168
androidTestImplementation(libs.androidx.test.ext.junit)

build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import org.jetbrains.kotlin.gradle.dsl.KotlinAndroidProjectExtension
44
import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
55

66
plugins {
7-
alias(libs.plugins.android.application) apply false
87
alias(libs.plugins.android.library) apply false
98
alias(libs.plugins.kotlin.android) apply false
109
alias(libs.plugins.kotlin.multiplatform) apply false

0 commit comments

Comments
 (0)