Skip to content

Commit 7d0f302

Browse files
committed
fix: right place for evaluation dependency
1 parent 196f381 commit 7d0f302

6 files changed

Lines changed: 13 additions & 36 deletions

File tree

gradle-plugins/react/brownfield/build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,6 @@ dependencies {
9494
implementation(libs.agp)
9595
implementation(libs.common)
9696
implementation(libs.asm.commons)
97-
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.3")
9897
implementation(libs.versioncompare)
9998
}
10099

gradle-plugins/react/brownfield/src/main/kotlin/com/callstack/react/brownfield/plugin/RNBrownfieldPlugin.kt

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,12 @@ class RNBrownfieldPlugin
7777
artifactsResolver.taskDependencyFactory = taskDependencyFactory
7878
artifactsResolver.fileResolver = fileResolver
7979

80+
// Must run before processDefaultDependencies: ArtifactsResolver reads :expo's api configuration,
81+
// which is only populated after the expo project is evaluated.
82+
if (this.isExpoProject) {
83+
project.evaluationDependsOn(EXPO_PROJECT_LOCATOR)
84+
}
85+
8086
val newArtifacts = artifactsResolver.processDefaultDependencies()
8187

8288
val jniLibsProcessor = JNILibsProcessor()
@@ -140,13 +146,6 @@ class RNBrownfieldPlugin
140146
aarLibraries.add(archiveLibrary)
141147
}
142148

143-
/**
144-
* early return if aarLibraries is empty, no need to register/configure further tasks
145-
*/
146-
if (aarLibraries.isEmpty()) {
147-
return@all
148-
}
149-
150149
/**
151150
* Flat IDs to be put into the variant property, required for RClass Transformer
152151
*/
@@ -212,18 +211,13 @@ class RNBrownfieldPlugin
212211
/** ===== processDataBinding ===== */
213212
val bundleTask = variantTaskProvider.bundleTaskProvider(project, variant.name)
214213
variantTaskProvider.processDataBinding(bundleTask, aarLibraries, variant.name)
214+
}
215215

216+
project.afterEvaluate {
216217
if (this.isExpoProject) {
217-
Logging.log("Expo project detected.")
218-
project.evaluationDependsOn(EXPO_PROJECT_LOCATOR)
219-
}
220-
221-
project.afterEvaluate {
222-
if (this.isExpoProject) {
223-
ExpoPublishingHelper(
224-
brownfieldAppProject = project,
225-
).afterEvaluate()
226-
}
218+
ExpoPublishingHelper(
219+
brownfieldAppProject = project,
220+
).afterEvaluate()
227221
}
228222
}
229223
}

gradle-plugins/react/brownfield/src/main/kotlin/com/callstack/react/brownfield/plugin/RNSourceSets.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ object RNSourceSets {
5858
// 2. Use the onVariants block to configure each variant
5959
componentsExtension.onVariants { variant ->
6060
// 3. Lazily configure the 'main' source set using .named()
61-
androidExtension.sourceSets.named("main") { sourceSet ->
61+
androidExtension.sourceSets.named(variant.name) { sourceSet ->
6262
// Paths are collected and added, similar to your improved version
6363
val bundlePathSegments =
6464
listOf(

gradle-plugins/react/brownfield/src/main/kotlin/com/callstack/react/brownfield/shared/ExplodeAarTask.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,7 @@ abstract class ExplodeAarTask : DefaultTask() {
3737
)
3838

3939
val aarLibraries = mutableListOf<AndroidArchiveLibrary>()
40-
val filteredArtifacts = artifacts.filter { it.bundleTaskName?.lowercase()?.contains(resolvedVariantName) == true }
41-
filteredArtifacts.forEach { art ->
40+
artifacts.forEach { art ->
4241
val archiveLibrary =
4342
AndroidArchiveLibrary(
4443
this.project,

gradle-plugins/react/brownfield/src/main/kotlin/com/callstack/react/brownfield/shared/JsonInstance.kt

Lines changed: 0 additions & 12 deletions
This file was deleted.

gradle-plugins/react/brownfield/src/main/kotlin/com/callstack/react/brownfield/shared/ModuleInfo.kt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
package com.callstack.react.brownfield.shared
22

3-
import kotlinx.serialization.Serializable
4-
53
interface ModuleInfo {
64
val moduleGroup: String
75
val moduleName: String
@@ -16,7 +14,6 @@ interface ModuleInfo {
1614
val bundleTaskName: String?
1715
}
1816

19-
@Serializable
2017
data class UnresolvedArtifactInfo(
2118
override val moduleGroup: String,
2219
override val moduleName: String,

0 commit comments

Comments
 (0)