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

Migrate compile configuration to implementation #567

Merged
merged 1 commit into from
Jun 16, 2022
Merged

Migrate compile configuration to implementation #567

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 9 additions & 9 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,17 +54,17 @@ configurations {
}

dependencies {
compileOnly "com.android.tools.build:gradle:3.5.0"
compileOnly "com.android.tools.build:gradle:3.5.0"

compile 'com.google.guava:guava:27.0.1-jre'
compile 'com.google.gradle:osdetector-gradle-plugin:1.7.0'
compile 'commons-lang:commons-lang:2.6'
implementation 'com.google.guava:guava:27.0.1-jre'
implementation 'com.google.gradle:osdetector-gradle-plugin:1.7.0'
implementation 'commons-lang:commons-lang:2.6'

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

test.inputs.files fileTree("$projectDir/testProject")
Expand Down
12 changes: 6 additions & 6 deletions examples/exampleKotlinDslProject/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@ sourceSets{
}

dependencies {
compile("com.google.protobuf:protobuf-java:3.6.1")
compile("io.grpc:grpc-stub:1.15.1")
compile("io.grpc:grpc-protobuf:1.15.1")
implementation("com.google.protobuf:protobuf-java:3.6.1")
implementation("io.grpc:grpc-stub:1.15.1")
implementation("io.grpc:grpc-protobuf:1.15.1")
if (JavaVersion.current().isJava9Compatible) {
// Workaround for @javax.annotation.Generated
// see: https://github.com/grpc/grpc-java/issues/3633
compile("javax.annotation:javax.annotation-api:1.3.1")
implementation("javax.annotation:javax.annotation-api:1.3.1")
}
// Extra proto source files besides the ones residing under
// "src/main".
Expand All @@ -39,7 +39,7 @@ dependencies {
// Adding dependency for configuration from custom sourceSet
"sampleProtobuf"(files("ext/"))

testCompile("junit:junit:4.12")
testImplementation("junit:junit:4.12")
// Extra proto source files for test besides the ones residing under
// "src/test".
testProtobuf(files("lib/protos-test.tar.gz"))
Expand All @@ -66,4 +66,4 @@ protobuf {
}
}
}
}
}
10 changes: 5 additions & 5 deletions examples/exampleProject/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,20 +20,20 @@ buildscript {
}

dependencies {
compile 'com.google.protobuf:protobuf-java:3.0.0'
compile 'io.grpc:grpc-stub:1.0.0-pre2'
compile 'io.grpc:grpc-protobuf:1.0.0-pre2'
implementation 'com.google.protobuf:protobuf-java:3.0.0'
implementation 'io.grpc:grpc-stub:1.0.0-pre2'
implementation 'io.grpc:grpc-protobuf:1.0.0-pre2'
if (JavaVersion.current().isJava9Compatible()) {
// Workaround for @javax.annotation.Generated
// see: https://github.com/grpc/grpc-java/issues/3633
compile 'javax.annotation:javax.annotation-api:1.3.1'
implementation 'javax.annotation:javax.annotation-api:1.3.1'
}
// Extra proto source files besides the ones residing under
// "src/main".
protobuf files("lib/protos.tar.gz")
protobuf files("ext/")

testCompile 'junit:junit:4.12'
testImplementation 'junit:junit:4.12'
// Extra proto source files for test besides the ones residing under
// "src/test".
testProtobuf files("lib/protos-test.tar.gz")
Expand Down
32 changes: 16 additions & 16 deletions testProjectAndroidBase/build_base.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,22 +96,22 @@ protobuf {
}

dependencies {
compile 'com.android.support:appcompat-v7:23.4.0'
compile 'com.squareup.okhttp:okhttp:2.7.5'
compile 'javax.annotation:javax.annotation-api:1.2'
compile 'com.google.protobuf:protobuf-lite:3.0.0'
compile 'io.grpc:grpc-core:1.0.0-pre2'
compile 'io.grpc:grpc-stub:1.0.0-pre2'
compile 'io.grpc:grpc-okhttp:1.0.0-pre2'
compile('io.grpc:grpc-protobuf-lite:1.0.0-pre2') {
// Otherwise Android compile will complain "Multiple dex files define ..."
exclude module: "protobuf-lite"
}
compile(project(':testProjectLite')) {
exclude module: "protobuf-lite"
}
protobuf files('lib/protos.jar')
testCompile 'junit:junit:4.12'
implementation 'com.android.support:appcompat-v7:23.4.0'
implementation 'com.squareup.okhttp:okhttp:2.7.5'
implementation 'javax.annotation:javax.annotation-api:1.2'
implementation 'com.google.protobuf:protobuf-lite:3.0.0'
implementation 'io.grpc:grpc-core:1.0.0-pre2'
implementation 'io.grpc:grpc-stub:1.0.0-pre2'
implementation 'io.grpc:grpc-okhttp:1.0.0-pre2'
implementation('io.grpc:grpc-protobuf-lite:1.0.0-pre2') {
// Otherwise Android compile will complain "Multiple dex files define ..."
exclude module: "protobuf-lite"
}
implementation(project(':testProjectLite')) {
exclude module: "protobuf-lite"
}
protobuf files('lib/protos.jar')
testImplementation 'junit:junit:4.12'
}

def assertJavaCompileHasProtoGeneratedDir(Object variant, Collection<String> codegenPlugins) {
Expand Down
20 changes: 10 additions & 10 deletions testProjectAndroidDependentBase/build_base.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,22 +96,22 @@ protobuf {
}

dependencies {
compile 'com.android.support:appcompat-v7:23.4.0'
compile 'com.squareup.okhttp:okhttp:2.7.5'
compile 'javax.annotation:javax.annotation-api:1.2'
compile 'com.google.protobuf:protobuf-lite:3.0.0'
compile 'io.grpc:grpc-core:1.0.0-pre2'
compile 'io.grpc:grpc-stub:1.0.0-pre2'
compile 'io.grpc:grpc-okhttp:1.0.0-pre2'
compile('io.grpc:grpc-protobuf-lite:1.0.0-pre2') {
implementation 'com.android.support:appcompat-v7:23.4.0'
implementation 'com.squareup.okhttp:okhttp:2.7.5'
implementation 'javax.annotation:javax.annotation-api:1.2'
implementation 'com.google.protobuf:protobuf-lite:3.0.0'
implementation 'io.grpc:grpc-core:1.0.0-pre2'
implementation 'io.grpc:grpc-stub:1.0.0-pre2'
implementation 'io.grpc:grpc-okhttp:1.0.0-pre2'
implementation('io.grpc:grpc-protobuf-lite:1.0.0-pre2') {
// Otherwise Android compile will complain "Multiple dex files define ..."
exclude module: "protobuf-lite"
}
compile(project(':testProjectAndroidLibrary')) {
implementation(project(':testProjectAndroidLibrary')) {
exclude module: "protobuf-lite"
}
protobuf files('lib/protos.jar')
testCompile 'junit:junit:4.12'
testImplementation 'junit:junit:4.12'
}

def assertJavaCompileHasProtoGeneratedDir(Object variant, Collection<String> codegenPlugins) {
Expand Down
20 changes: 10 additions & 10 deletions testProjectAndroidKotlinDsl/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,22 +130,22 @@ protobuf {
}

dependencies {
compile("com.android.support:appcompat-v7:23.4.0")
compile("com.squareup.okhttp:okhttp:2.7.5")
compile("javax.annotation:javax.annotation-api:1.2")
compile("com.google.protobuf:protobuf-lite:3.0.0")
compile("io.grpc:grpc-core:1.0.0-pre2")
compile("io.grpc:grpc-stub:1.0.0-pre2")
compile("io.grpc:grpc-okhttp:1.0.0-pre2")
compile("io.grpc:grpc-protobuf-lite:1.0.0-pre2") {
implementation("com.android.support:appcompat-v7:23.4.0")
implementation("com.squareup.okhttp:okhttp:2.7.5")
implementation("javax.annotation:javax.annotation-api:1.2")
implementation("com.google.protobuf:protobuf-lite:3.0.0")
implementation("io.grpc:grpc-core:1.0.0-pre2")
implementation("io.grpc:grpc-stub:1.0.0-pre2")
implementation("io.grpc:grpc-okhttp:1.0.0-pre2")
implementation("io.grpc:grpc-protobuf-lite:1.0.0-pre2") {
// Otherwise Android compile will complain "Multiple dex files define ..."
exclude(module = "protobuf-lite")
}
compile(project(":testProjectLite")) {
implementation(project(":testProjectLite")) {
exclude(module = "protobuf-lite")
}
protobuf(files("lib/protos.jar"))
testCompile("junit:junit:4.12")
testImplementation("junit:junit:4.12")
}

afterEvaluate {
Expand Down
16 changes: 8 additions & 8 deletions testProjectAndroidLibrary/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,14 +78,14 @@ protobuf {
}

dependencies {
compile 'javax.annotation:javax.annotation-api:1.2'
compile 'com.google.protobuf:protobuf-lite:3.0.0'
compile 'io.grpc:grpc-core:1.0.0-pre2'
compile 'io.grpc:grpc-stub:1.0.0-pre2'
compile 'io.grpc:grpc-okhttp:1.0.0-pre2'
compile('io.grpc:grpc-protobuf-lite:1.0.0-pre2') {
implementation 'javax.annotation:javax.annotation-api:1.2'
implementation 'com.google.protobuf:protobuf-lite:3.0.0'
implementation 'io.grpc:grpc-core:1.0.0-pre2'
implementation 'io.grpc:grpc-stub:1.0.0-pre2'
implementation 'io.grpc:grpc-okhttp:1.0.0-pre2'
implementation('io.grpc:grpc-protobuf-lite:1.0.0-pre2') {
// Otherwise Android compile will complain "Multiple dex files define ..."
exclude module: "protobuf-lite"
}
testCompile 'junit:junit:4.12'
}
testImplementation 'junit:junit:4.12'
}
17 changes: 6 additions & 11 deletions testProjectBase/build_base.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,8 @@ repositories {
sourceCompatibility = JavaVersion.VERSION_1_7
targetCompatibility = JavaVersion.VERSION_1_7

configurations {
grpcCompile
}

sourceSets {
grpc {
compileClasspath += configurations.grpcCompile
}
test {
compileClasspath += grpc.output
Expand All @@ -29,13 +24,13 @@ dependencies {
protobuf files("ext/")
testProtobuf files("lib/protos-test.tar.gz")

compile protobufDep
testCompile 'junit:junit:4.12'
implementation protobufDep
testImplementation 'junit:junit:4.12'
// KotlinFooTest.kt requires reflection utilities
testCompile "org.jetbrains.kotlin:kotlin-reflect:1.2.0"
grpcCompile protobufDep
grpcCompile 'io.grpc:grpc-stub:1.0.0-pre2'
grpcCompile 'io.grpc:grpc-protobuf:1.0.0-pre2'
testImplementation "org.jetbrains.kotlin:kotlin-reflect:1.2.0"
grpcImplementation protobufDep
grpcImplementation 'io.grpc:grpc-stub:1.0.0-pre2'
grpcImplementation 'io.grpc:grpc-protobuf:1.0.0-pre2'
}

protobuf {
Expand Down
4 changes: 2 additions & 2 deletions testProjectBuildTimeProto/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ repositories {
}

dependencies {
compile 'com.google.protobuf:protobuf-java:3.0.0'
implementation 'com.google.protobuf:protobuf-java:3.0.0'
}

sourceSets {
Expand Down Expand Up @@ -43,4 +43,4 @@ protobuf {
generateProtoTasks {
all().each { task -> task.dependsOn generateProtobuf }
}
}
}
6 changes: 3 additions & 3 deletions testProjectCustomProtoDir/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ plugins {
}

repositories {
maven { url "https://plugins.gradle.org/m2/" }
maven { url "https://plugins.gradle.org/m2/" }
}

sourceSets {
Expand All @@ -33,9 +33,9 @@ sourceSets {
}

dependencies {
compile 'com.google.protobuf:protobuf-java:3.0.0'
implementation 'com.google.protobuf:protobuf-java:3.0.0'

testCompile 'junit:junit:4.12'
testImplementation 'junit:junit:4.12'
}

protobuf.protoc {
Expand Down
8 changes: 4 additions & 4 deletions testProjectDependent/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@ plugins {
}

repositories {
maven { url "https://plugins.gradle.org/m2/" }
maven { url "https://plugins.gradle.org/m2/" }
}

dependencies {
compile 'com.google.protobuf:protobuf-java:3.0.0'
compile project(':testProject')
implementation 'com.google.protobuf:protobuf-java:3.0.0'
implementation project(':testProject')

testCompile 'junit:junit:4.12'
testImplementation 'junit:junit:4.12'
}

protobuf.protoc {
Expand Down
23 changes: 10 additions & 13 deletions testProjectKotlinDslBase/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,19 +22,16 @@ java {
targetCompatibility = JavaVersion.VERSION_1_7
}

val grpcCompile by configurations.creating

the<JavaPluginConvention>().sourceSets {

val grpc by creating {
compileClasspath += grpcCompile
sourceSets {
val grpc = create("grpc") {
}

"test"{
getByName("test") {
compileClasspath += grpc.output
runtimeClasspath += grpc.output
}
}
val grpcImplementation = configurations.getByName("grpcImplementation")

val protobufDep = "com.google.protobuf:protobuf-java:3.0.0"

Expand All @@ -43,13 +40,13 @@ dependencies {
protobuf(files("ext/"))
testProtobuf(files("lib/protos-test.tar.gz"))

compile(protobufDep)
testCompile("junit:junit:4.12")
implementation(protobufDep)
testImplementation("junit:junit:4.12")
// KotlinFooTest.kt requires reflection utilities
testCompile("org.jetbrains.kotlin:kotlin-reflect:1.2.0")
grpcCompile(protobufDep)
grpcCompile("io.grpc:grpc-stub:1.0.0-pre2")
grpcCompile("io.grpc:grpc-protobuf:1.0.0-pre2")
testImplementation("org.jetbrains.kotlin:kotlin-reflect:1.2.0")
grpcImplementation(protobufDep)
grpcImplementation("io.grpc:grpc-stub:1.0.0-pre2")
grpcImplementation("io.grpc:grpc-protobuf:1.0.0-pre2")
}

protobuf {
Expand Down
4 changes: 2 additions & 2 deletions testProjectLite/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ sourceCompatibility = JavaVersion.VERSION_1_7
targetCompatibility = JavaVersion.VERSION_1_7

dependencies {
compile 'com.google.protobuf:protobuf-lite:3.0.0'
implementation 'com.google.protobuf:protobuf-lite:3.0.0'
protobuf files("ext/")
testCompile 'junit:junit:4.12'
testImplementation 'junit:junit:4.12'
}

protobuf {
Expand Down