Skip to content

Commit 540b4d3

Browse files
author
Louis Ryan
committed
Revert "Draft of Android specific Channe builder"
This reverts commit d6dc790.
1 parent 9466eb5 commit 540b4d3

File tree

11 files changed

+10
-434
lines changed

11 files changed

+10
-434
lines changed

.travis.yml

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,6 @@
11
sudo: false
22

3-
language: android
4-
5-
android:
6-
components:
7-
- build-tools-21.1.1 # preinstalled in travis env
8-
- android-21
9-
10-
script: ./gradlew build
3+
language: java
114

125
env:
136
global:

android-interop-testing/app/build.gradle

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
1-
apply plugin: 'android-sdk-manager'
21
apply plugin: 'com.android.application'
32
apply plugin: 'com.google.protobuf'
43

5-
def properties = new Properties()
6-
properties.load(new FileInputStream(file('../../version.properties')))
7-
84
android {
95
compileSdkVersion 22
106
buildToolsVersion '22.0.1'
@@ -37,7 +33,7 @@ protobuf {
3733
}
3834
plugins {
3935
grpc {
40-
artifact = "io.grpc:protoc-gen-grpc-java:${properties.version}"
36+
artifact = 'io.grpc:protoc-gen-grpc-java:0.9.0-SNAPSHOT'
4137
}
4238
}
4339
generateProtoTasks {
@@ -68,9 +64,10 @@ dependencies {
6864
compile 'com.squareup.okhttp:okhttp:2.2.0'
6965
testCompile 'junit:junit:4.12'
7066
// You need to build grpc-java to obtain these libraries below.
71-
compile "io.grpc:grpc-android:${properties.version}"
72-
compile "io.grpc:grpc-protobuf-nano:${properties.version}"
73-
compile "io.grpc:grpc-stub:${properties.version}"
74-
compile "io.grpc:grpc-testing:${properties.version}"
67+
compile 'io.grpc:grpc-core:0.9.0-SNAPSHOT'
68+
compile 'io.grpc:grpc-protobuf-nano:0.9.0-SNAPSHOT'
69+
compile 'io.grpc:grpc-okhttp:0.9.0-SNAPSHOT'
70+
compile 'io.grpc:grpc-stub:0.9.0-SNAPSHOT'
71+
compile 'io.grpc:grpc-testing:0.9.0-SNAPSHOT'
7572
compile 'javax.annotation:javax.annotation-api:1.2'
76-
}
73+
}

android-interop-testing/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ buildscript {
55
jcenter()
66
}
77
dependencies {
8-
classpath 'com.jakewharton.sdkmanager:gradle-plugin:0.12.+'
98
classpath 'com.android.tools.build:gradle:1.1.0'
109
classpath "com.google.protobuf:protobuf-gradle-plugin:0.6.1"
1110

android/build.gradle

Lines changed: 0 additions & 27 deletions
This file was deleted.

android/delegate.gradle

Lines changed: 0 additions & 151 deletions
This file was deleted.

android/src/androidTest/java/io/grpc/android/AndroidChannelBuilderTest.java

Lines changed: 0 additions & 56 deletions
This file was deleted.

android/src/main/AndroidManifest.xml

Lines changed: 0 additions & 34 deletions
This file was deleted.

0 commit comments

Comments
 (0)