updating module names

linkedin · Nov 24, 2024 · 81e11a0 · 81e11a0
1 parent 88b0c6b
commit 81e11a0
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 10 deletions.
diff --git a/apps/spark-3.5/build.gradle b/apps/spark-3.5/build.gradle
@@ -9,10 +9,10 @@ ext {
 
     sparkVersion = '3.5.2'
     icebergVersion = '1.5.2'
-    sparkVersionSuffix = "-3.5"
-    openhouseSparkRuntimeModule = ":integrations:spark${sparkVersionSuffix}:openhouse-spark${sparkVersionSuffix}-runtime_2.12"
+    sparkVersionSuffix = "3.5"
+    openhouseSparkRuntimeModule = ":integrations:spark:spark-${sparkVersionSuffix}:openhouse-spark-3.5-runtime_2.12"
     icebergSparkRuntimeModule = "org.apache.iceberg:iceberg-spark-runtime-3.5_2.12:${icebergVersion}"
-    tablesTestFixturesModule = ":tables-test-fixtures-iceberg-1.5_2.12"
+    tablesTestFixturesModule = ":tables-test-fixtures:tables-test-fixtures-iceberg-1.5_2.12"
 }
 
 dependencies {

diff --git a/apps/spark/build.gradle b/apps/spark/build.gradle
@@ -9,10 +9,10 @@ ext {
 
     sparkVersion = '3.1.1'
     icebergVersion = '1.2.0'
-    sparkVersionSuffix = ""
-    openhouseSparkRuntimeModule = ":integrations:spark${sparkVersionSuffix}:openhouse-spark${sparkVersionSuffix}-runtime_2.12"
+    sparkVersionSuffix = "3.1"
+    openhouseSparkRuntimeModule = ":integrations:spark:spark-${sparkVersionSuffix}:openhouse-spark-runtime_2.12"
     icebergSparkRuntimeModule = "org.apache.iceberg:iceberg-spark-runtime-3.1_2.12:${icebergVersion}"
-    tablesTestFixturesModule = ":tables-test-fixtures_2.12"
+    tablesTestFixturesModule = ":tables-test-fixtures:tables-test-fixtures_2.12"
 }
 
 dependencies {

diff --git a/libs/datalayout/build.gradle b/libs/datalayout/build.gradle
@@ -9,10 +9,13 @@ ext {
     sparkVersion = '3.1.1'
     springVersion = '2.7.8'
     hadoopVersion = '2.10.0'
+    sparkVersionSuffix = "3.1"
+    openhouseSparkRuntimeModule = ":integrations:spark:spark-${sparkVersionSuffix}:openhouse-spark-runtime_2.12"
+    tablesTestFixturesModule = ":tables-test-fixtures:tables-test-fixtures_2.12"
 }
 
 dependencies {
-    compileOnly project(':integrations:spark:openhouse-spark-runtime_2.12')
+    compileOnly project(openhouseSparkRuntimeModule)
     implementation('org.apache.iceberg:iceberg-bundled-guava:' + icebergVersion)
     implementation('org.apache.iceberg:iceberg-data:' + icebergVersion)
     implementation('org.apache.iceberg:iceberg-core:' + icebergVersion)
@@ -31,7 +34,7 @@ dependencies {
     implementation 'org.apache.hadoop:hadoop-common:' + hadoopVersion
     implementation 'org.apache.iceberg:iceberg-spark-runtime-3.1_2.12:' + icebergVersion
 
-    testImplementation (project(path: ':integrations:spark:openhouse-spark-runtime_2.12', configuration: 'shadow')) {
+    testImplementation (project(path: openhouseSparkRuntimeModule, configuration: 'shadow')) {
         exclude group: 'io.netty'
         exclude group: 'org.apache.hadoop', module: 'hadoop-common'
         exclude group: 'org.apache.hadoop', module: 'hadoop-client'
@@ -42,7 +45,7 @@ dependencies {
     testImplementation 'org.mockito:mockito-inline:4.11.0'
     testImplementation 'org.powermock:powermock-module-junit4:2.0.9'
     testImplementation 'org.powermock:powermock-api-mockito2:2.0.9'
-    testImplementation(project(':tables-test-fixtures_2.12'))
+    testImplementation(project(tablesTestFixturesModule))
     testRuntimeOnly("org.eclipse.jetty:jetty-server:11.0.2")
 }
 

diff --git a/settings.gradle b/settings.gradle
@@ -24,7 +24,6 @@ pluginManagement {
 
 rootProject.name = 'openhouse'
 
-include ':apps'
 include ':apps:spark'
 include ':apps:spark-3.5'