Skip to content

Commit dd77a6f

Browse files
authored
Merge pull request #16 from lulichn/cleanup-gradle-settings
Cleanup gradle settings
2 parents f27e0f9 + bdf89c1 commit dd77a6f

File tree

4 files changed

+3
-273
lines changed

4 files changed

+3
-273
lines changed

build.gradle

+2-37
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ plugins {
22
id "com.jfrog.bintray" version "1.1"
33
id "com.github.jruby-gradle.base" version "1.5.0"
44
id "scala"
5-
id "checkstyle"
65
id "com.diffplug.gradle.spotless" version "3.27.1"
76
}
87

@@ -35,52 +34,19 @@ dependencies {
3534
testCompile "org.embulk:embulk-test:0.9.23"
3635
}
3736

38-
compileScala {
39-
scalaCompileOptions.metaClass.useCompileDaemon = true
40-
}
41-
4237
spotless {
4338
scala {
4439
scalafmt('2.3.2').configFile('.scalafmt.conf')
4540
}
4641
}
4742

48-
tasks.withType(ScalaCompile) {
49-
configure(scalaCompileOptions.forkOptions) {
50-
memoryMaximumSize = '1g'
51-
jvmArgs = ['-XX:MaxPermSize=1024m']
52-
}
53-
}
54-
55-
// Activating the Zinc based compiler
56-
tasks.withType(ScalaCompile) {
57-
scalaCompileOptions.metaClass.useAnt = false
58-
}
59-
6043
task classpath(type: Copy, dependsOn: ["jar"]) {
6144
doFirst { file("classpath").deleteDir() }
6245
from (configurations.runtime - configurations.provided + files(jar.archivePath))
6346
into "classpath"
6447
}
6548
clean { delete "classpath" }
6649

67-
checkstyle {
68-
configFile = file("${project.rootDir}/config/checkstyle/checkstyle.xml")
69-
toolVersion = '6.14.1'
70-
}
71-
checkstyleMain {
72-
configFile = file("${project.rootDir}/config/checkstyle/default.xml")
73-
ignoreFailures = true
74-
}
75-
checkstyleTest {
76-
configFile = file("${project.rootDir}/config/checkstyle/default.xml")
77-
ignoreFailures = true
78-
}
79-
task checkstyle(type: Checkstyle) {
80-
classpath = sourceSets.main.output + sourceSets.test.output
81-
source = sourceSets.main.allJava + sourceSets.test.allJava
82-
}
83-
8450
task gem(type: JRubyExec, dependsOn: ["gemspec", "classpath"]) {
8551
jrubyArgs "-S"
8652
script "gem"
@@ -109,18 +75,17 @@ task gemspec {
10975
Gem::Specification.new do |spec|
11076
spec.name = "${project.name}"
11177
spec.version = "${project.version}"
112-
spec.authors = ["Daisuke Higashi"]
78+
spec.authors = ["Daisuke Higashi", "Civitaspo"]
11379
spec.summary = %[Dynamodb input plugin for Embulk]
11480
spec.description = %["Loads records from Dynamodb."]
115-
spec.email = ["[email protected]"]
81+
11682
spec.licenses = ["MIT"]
11783
spec.homepage = "https://github.com/lulichn/embulk-input-dynamodb"
11884

11985
spec.files = `git ls-files`.split("\n") + Dir["classpath/*.jar"]
12086
spec.test_files = spec.files.grep(%r"^(test|spec)/")
12187
spec.require_paths = ["lib"]
12288

123-
#spec.add_dependency 'YOUR_GEM_DEPENDENCY', ['~> YOUR_GEM_DEPENDENCY_VERSION']
12489
spec.add_development_dependency 'bundler', ['~> 1.0']
12590
spec.add_development_dependency 'rake', ['~> 12.0']
12691
end

config/checkstyle/checkstyle.xml

-128
This file was deleted.

config/checkstyle/default.xml

-108
This file was deleted.

settings.gradle

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
rootProject.name = 'embulk-input-dynamodb'

0 commit comments

Comments
 (0)