Skip to content

Commit

Permalink
CLI command name fix + bump shadow plugin version + cleanup (#164)
Browse files Browse the repository at this point in the history
  • Loading branch information
tovbinm committed Oct 26, 2018
1 parent 5a46ac1 commit 4572d38
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 18 deletions.
6 changes: 3 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'org.github.ngbinh.scalastyle:gradle-scalastyle-plugin_2.11:0.9.0'
classpath 'org.github.ngbinh.scalastyle:gradle-scalastyle-plugin_2.11:1.0.1'
}
}

Expand Down Expand Up @@ -49,8 +49,8 @@ configure(allProjs) {
sourceCompatibility = 1.8
targetCompatibility = 1.8

// Max: Set this to the main class for cli.
// Could not figure out how to configure it just for the cli subproject
// Set this to the main class for cli.
// Could not figure out how to configure it just for the cli subproject.
mainClassName = "com.salesforce.op.cli.CLI"

ext {
Expand Down
12 changes: 0 additions & 12 deletions cli/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
apply plugin: 'com.github.johnrengelman.shadow'

dependencies {
// scopt
compile "com.github.scopt:scopt_$scalaVersion:$scoptVersion"
Expand All @@ -25,13 +23,6 @@ ext {
templateResourcesDir = "$project.buildDir/template-resources"
}

shadowJar {
zip64 = true
exclude 'META-INF/maven/**'
baseName = jar.baseName
}
shadowJar.dependsOn(createVersionProperties)

task copySpark(type: Copy) {
from '../templates/simple/gradle'
into "$templateResourcesDir/templates/simple/gradle"
Expand All @@ -42,13 +33,11 @@ task copySpark(type: Copy) {
}

task copyTools(type: Copy) {

from '../templates/simple'
into "$templateResourcesDir/templates/simple"
include "**/gradlew"
include "**/spark.gradle"
exclude "**/*.gradle.template"

}

task copyLocalTemplates(type: Copy) {
Expand All @@ -58,7 +47,6 @@ task copyLocalTemplates(type: Copy) {
}

task copyTemplates(type: Copy) {

from '../templates'
into "$templateResourcesDir/templates"
exclude '**/*.jar'
Expand Down
4 changes: 2 additions & 2 deletions cli/src/main/scala/com/salesforce/op/cli/CommandParser.scala
Original file line number Diff line number Diff line change
Expand Up @@ -62,10 +62,10 @@ trait OpCli {
}
}

object CommandParser extends scopt.OptionParser[CliParameters]("op") with OpCli {
object CommandParser extends scopt.OptionParser[CliParameters]("transmogrifai") with OpCli {
private[cli] var AUTO_ENABLED = true // for testing, temporary

head("op: TransmogrifAI CLI")
head("transmogrifai: TransmogrifAI CLI")

help("help")

Expand Down
2 changes: 1 addition & 1 deletion helloworld/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ buildscript {
maven { url "https://plugins.gradle.org/m2/" }
}
dependencies {
classpath 'org.github.ngbinh.scalastyle:gradle-scalastyle-plugin_2.11:0.9.0'
classpath 'org.github.ngbinh.scalastyle:gradle-scalastyle-plugin_2.11:1.0.1'
}
}
plugins {
Expand Down

0 comments on commit 4572d38

Please sign in to comment.