Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -109,3 +109,11 @@ oldhash

# ignore accel
incubator-gluten/

# checkpoints

checkpoints/

# native build artifacts
native/src/libhigh-performance-spark-gluten-0.a
native/src/cmake_install.cmake
35 changes: 21 additions & 14 deletions .scalafix.conf
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,25 @@ OrganizeImports {
}

rules = [
DisableSyntax,
SparkAutoUpgrade,
MigrateHiveContext,
MigrateToSparkSessionBuilder,
MigrateDeprecatedDataFrameReaderFuns,
AccumulatorUpgrade,
onFailureFix,
ExecutorPluginWarn,
UnionRewrite,
GroupByKeyWarn,
GroupByKeyRewrite,
MetadataWarnQQ,
ScalaTestExtendsFix,
ScalaTestImportChange
// DisableSyntax,
// SparkAutoUpgrade,
// MigrateHiveContext,
// MigrateToSparkSessionBuilder,
// MigrateDeprecatedDataFrameReaderFuns,
// AccumulatorUpgrade,
// onFailureFix,
// ExecutorPluginWarn,
// UnionRewrite,
// GroupByKeyWarn,
// GroupByKeyRewrite,
// MetadataWarnQQ,
// ScalaTestExtendsFix,
// ScalaTestImportChange.
TypelevelUnusedIO
TypelevelMapSequence
TypelevelAs
TypelevelUnusedShowInterpolator
TypelevelFs2SyncCompiler
TypelevelHttp4sLiteralsSyntax
TypelevelIORandomUUID
]
2 changes: 2 additions & 0 deletions .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
version = 3.10.1
runner.dialect = "Scala213"
13 changes: 7 additions & 6 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,20 @@ organization := "com.highperformancespark"

lazy val V = _root_.scalafix.sbt.BuildInfo

scalaVersion := "2.13.13"
ThisBuild / scalaVersion := "2.13.16"
addCompilerPlugin(scalafixSemanticdb)
scalacOptions ++= List(
ThisBuild / scalacOptions ++= List(
"-Yrangepos",
"-P:semanticdb:synthetics:on"
)

ThisBuild / semanticdbEnabled := true

name := "examples"

publishMavenStyle := true

version := "0.0.1"
version := "0.0.2"
resolvers ++= Seq(
"JBoss Repository" at "https://repository.jboss.org/nexus/content/repositories/releases/",
"Cloudera Repository" at "https://repository.cloudera.com/artifactory/cloudera-repos/",
Expand Down Expand Up @@ -67,10 +68,8 @@ val sparkTestingVersion = settingKey[String]("Spark testing base version without
lazy val core = (project in file("core")) // regular scala code with @native methods
.dependsOn(native % Runtime)
.settings(javah / target := (native / nativeCompile / sourceDirectory).value / "include")
.settings(scalaVersion := "2.13.13")
.settings(sbtJniCoreScope := Compile)
.settings(
scalaVersion := "2.13.8",
javacOptions ++= Seq("-source", "17", "-target", "17"),
parallelExecution in Test := false,
fork := true,
Expand Down Expand Up @@ -102,7 +101,6 @@ lazy val core = (project in file("core")) // regular scala code with @native met
// JNI Magic!
lazy val native = (project in file("native")) // native code and build script
.settings(nativeCompile / sourceDirectory := sourceDirectory.value)
.settings(scalaVersion := "2.13.13")
.enablePlugins(JniNative) // JniNative needs to be explicitly enabled

//tag::xmlVersionConflict[]
Expand All @@ -123,3 +121,6 @@ assemblyMergeStrategy in native := {
assemblyMergeStrategy in core := {
case x => MergeStrategy.first
}

// Typelevel scala format type checks
ThisBuild / scalafixDependencies += "org.typelevel" %% "typelevel-scalafix" % "0.5.0"
Loading
Loading