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

Remove Guava and commons-lang dependencies #269

Closed
wants to merge 4 commits into from
Closed

Remove Guava and commons-lang dependencies #269

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
17e52b9
Remove Guava and commons-lang dependencies and usages
mkobit Oct 18, 2018
dc3c256
⇡ Gradle versions plugin dependency
mkobit Oct 19, 2018
16ec629
⇡ Spock dependency version
mkobit Oct 19, 2018
4764c33
⇡ `common-io` dependency version
mkobit Oct 19, 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
8 changes: 3 additions & 5 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ buildscript {
dependencies {
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.6'
classpath "com.gradle.publish:plugin-publish-plugin:0.9.7"
classpath "com.github.ben-manes:gradle-versions-plugin:0.12.0"
classpath "com.github.ben-manes:gradle-versions-plugin:0.20.0"
}
}

Expand Down Expand Up @@ -65,18 +65,16 @@ task createClasspathManifest {
dependencies {
compileOnly gradleApi()
compileOnly localGroovy()
compile 'com.google.guava:guava:18.0'
compile 'com.google.gradle:osdetector-gradle-plugin:1.4.0'
compile 'commons-lang:commons-lang:2.6'

testCompile gradleTestKit()
testCompile gradleApi()
testCompile localGroovy()
testCompile 'junit:junit:4.12'
testCompile ('org.spockframework:spock-core:1.0-groovy-2.4') {
testCompile ('org.spockframework:spock-core:1.1-groovy-2.4') {
exclude module : 'groovy-all'
}
testCompile 'commons-io:commons-io:2.5'
testCompile 'commons-io:commons-io:2.6'

testProjectRuntime "org.jetbrains.kotlin:kotlin-gradle-plugin:1.2.0"

Expand Down
5 changes: 2 additions & 3 deletions src/main/groovy/com/google/protobuf/gradle/Utils.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
package com.google.protobuf.gradle

import com.google.common.base.Preconditions
import org.apache.commons.lang.StringUtils
import org.gradle.api.GradleException
import org.gradle.api.Project
import org.gradle.api.tasks.SourceSet
Expand All @@ -49,7 +48,7 @@ class Utils {
*/
static String getConfigName(String sourceSetName, String type) {
return sourceSetName == SourceSet.MAIN_SOURCE_SET_NAME ?
type : (sourceSetName + StringUtils.capitalize(type))
type : (sourceSetName + type.capitalize())
}

/**
Expand All @@ -58,7 +57,7 @@ class Utils {
*/
static String getSourceSetSubstringForTaskNames(String sourceSetName) {
return sourceSetName == SourceSet.MAIN_SOURCE_SET_NAME ?
'' : StringUtils.capitalize(sourceSetName)
'' : sourceSetName.capitalize()
}

private static final String ANDROID_BASE_PLUGIN_ID = "com.android.base"
Expand Down
4 changes: 2 additions & 2 deletions src/test/groovy/com/google/protobuf/gradle/ProtobufPluginTestHelper.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,8 +131,8 @@ buildscript {

File build() {
File projectDir = new File(System.getProperty('user.dir'), 'build/tests/' + testProjectName)
FileUtils.deleteDirectory(projectDir)
FileUtils.forceMkdir(projectDir)
projectDir.deleteDir()
projectDir.mkdirs()
sourceDirs.each {
FileUtils.copyDirectory(new File(System.getProperty("user.dir"), it), projectDir)
}
Expand Down