Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

CLI command name fix + bump shadow plugin version + cleanup #164

Merged
merged 2 commits into from
Oct 26, 2018
Merged

CLI command name fix + bump shadow plugin version + cleanup #164

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cc00a78
CLI command name fix + bump shadow plugin version + cleanup
tovbinm Oct 25, 2018
153ecc4
Merge branch 'master' into mt/shadow2
tovbinm Oct 26, 2018
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
6 changes: 3 additions & 3 deletions build.gradle
View file
Open in desktop
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.
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:-)

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is currently no other way. I also checked ;)

// 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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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