File tree Expand file tree Collapse file tree 5 files changed +37
-43
lines changed Expand file tree Collapse file tree 5 files changed +37
-43
lines changed Original file line number Diff line number Diff line change @@ -223,6 +223,20 @@ allprojects {
223
223
} catch (_: UnknownDomainObjectException ) {
224
224
logger.warn(" Could not set buildConfig on :${this .name} " )
225
225
}
226
+
227
+ try {
228
+ val instrumentedJars: Configuration by configurations.creating {
229
+ isCanBeConsumed = true
230
+ isCanBeResolved = false
231
+ }
232
+ artifacts {
233
+ add(" instrumentedJars" , tasks.jar.get().archiveFile) {
234
+ builtBy(tasks.jar)
235
+ }
236
+ }
237
+ } catch (_: Exception ) {
238
+ logger.warn(" Could not set instrumentedJars on :${this .name} " )
239
+ }
226
240
}
227
241
}
228
242
Original file line number Diff line number Diff line change @@ -386,17 +386,6 @@ kotlinPublications {
386
386
}
387
387
}
388
388
389
- val instrumentedJars: Configuration by configurations.creating {
390
- isCanBeConsumed = true
391
- isCanBeResolved = false
392
- }
393
-
394
- artifacts {
395
- add(" instrumentedJars" , tasks.jar.get().archiveFile) {
396
- builtBy(tasks.jar)
397
- }
398
- }
399
-
400
389
// Disable and enable if updating plugin breaks the build
401
390
dataframes {
402
391
schema {
Original file line number Diff line number Diff line change @@ -160,14 +160,3 @@ kotlinPublications {
160
160
kotlin {
161
161
explicitApi()
162
162
}
163
-
164
- val instrumentedJars: Configuration by configurations.creating {
165
- isCanBeConsumed = true
166
- isCanBeResolved = false
167
- }
168
-
169
- artifacts {
170
- add(" instrumentedJars" , tasks.jar.get().archiveFile) {
171
- builtBy(tasks.jar)
172
- }
173
- }
Original file line number Diff line number Diff line change @@ -59,17 +59,6 @@ sourceSets {
59
59
}
60
60
}
61
61
62
- val instrumentedJars: Configuration by configurations.creating {
63
- isCanBeConsumed = true
64
- isCanBeResolved = false
65
- }
66
-
67
- artifacts {
68
- add(" instrumentedJars" , tasks.jar.get().archiveFile) {
69
- builtBy(tasks.jar)
70
- }
71
- }
72
-
73
62
kotlinPublications {
74
63
publication {
75
64
publicationName = " dataframeJson"
Original file line number Diff line number Diff line change @@ -37,21 +37,34 @@ repositories {
37
37
mavenLocal() // for local development
38
38
}
39
39
40
+ val dependentProjectPaths = with (projects) {
41
+ listOf (
42
+ core,
43
+ dataframeArrow,
44
+ dataframeExcel,
45
+ dataframeJdbc,
46
+ dataframeCsv,
47
+ dataframeJson,
48
+ )
49
+ }.map { it.path }
50
+
40
51
tasks.compileKotlin {
41
- dependsOn(projects.core.path + " :jar" )
52
+ dependentProjectPaths.forEach {
53
+ dependsOn(" $it :jar" )
54
+ }
42
55
}
43
56
44
- val coreJar = project(projects.core.path).configurations
45
- .getByName(" instrumentedJars" )
46
- .artifacts.single()
47
- .file.absolutePath
48
- .replace(File .separatorChar, ' /' )
57
+ val jarPaths = dependentProjectPaths.map {
58
+ project(it).configurations
59
+ .getByName(" instrumentedJars" )
60
+ .artifacts.single()
61
+ .file.absolutePath
62
+ .replace(File .separatorChar, ' /' )
63
+ }
49
64
50
65
dependencies {
51
- implementation(projects.dataframe) {
52
- // exclude(group, "dataframe-core")
53
- }
54
- implementation(files(coreJar))
66
+ // implementation(projects.dataframe) Must depend on jars for the compiler plugin to work!
67
+ implementation(files(jarPaths))
55
68
56
69
testImplementation(libs.junit)
57
70
testImplementation(libs.kotestAssertions) {
You can’t perform that action at this time.
0 commit comments