grpc
/
grpc-java
mirror of https://github.com/grpc/grpc-java.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

android-interop-testing: update app dependencies (#4313)

This commit is contained in:
Eric Gribkoff 2018-04-24 14:33:06 -07:00 committed by GitHub
parent 62e6e2de78
commit 3beb73eb46
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
android-interop-testing/app/build.gradle
View File

@ -2,14 +2,13 @@ apply plugin: 'com.android.application'
apply plugin: 'com.google.protobuf' apply plugin: 'com.google.protobuf'
android { android {
compileSdkVersion 22 compileSdkVersion 26
buildToolsVersion '25.0.2'
defaultConfig { defaultConfig {
applicationId "io.grpc.android.integrationtest" applicationId "io.grpc.android.integrationtest"
// API level 14+ is required for TLS since Google Play Services v10.2 // API level 14+ is required for TLS since Google Play Services v10.2
minSdkVersion 14 minSdkVersion 14
targetSdkVersion 22 targetSdkVersion 26
versionCode 1 versionCode 1
versionName "1.0" versionName "1.0"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@ -58,9 +57,9 @@ protobuf {
} }
dependencies { dependencies {
compile 'com.android.support:appcompat-v7:22.2.1' compile 'com.android.support:appcompat-v7:26.1.0'
compile 'com.android.support:support-annotations:23.1.1' compile 'com.android.support:support-annotations:27.1.1'
compile 'com.google.android.gms:play-services-base:7.3.0' compile 'com.google.android.gms:play-services-base:12.0.1'
// You need to build grpc-java to obtain the grpc libraries below. // You need to build grpc-java to obtain the grpc libraries below.
compile 'io.grpc:grpc-protobuf-nano:1.13.0-SNAPSHOT' // CURRENT_GRPC_VERSION compile 'io.grpc:grpc-protobuf-nano:1.13.0-SNAPSHOT' // CURRENT_GRPC_VERSION
compile 'io.grpc:grpc-okhttp:1.13.0-SNAPSHOT' // CURRENT_GRPC_VERSION compile 'io.grpc:grpc-okhttp:1.13.0-SNAPSHOT' // CURRENT_GRPC_VERSION
@ -69,8 +68,8 @@ dependencies {
compile 'javax.annotation:javax.annotation-api:1.2' compile 'javax.annotation:javax.annotation-api:1.2'
compile 'junit:junit:4.12' compile 'junit:junit:4.12'
androidTestCompile 'com.android.support.test:rules:0.5' androidTestCompile 'com.android.support.test:rules:1.0.1'
androidTestCompile 'com.android.support.test:runner:0.5' androidTestCompile 'com.android.support.test:runner:1.0.1'
} }
gradle.projectsEvaluated { gradle.projectsEvaluated {

5
android-interop-testing/app/src/main/AndroidManifest.xml
View File

@ -2,11 +2,6 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="io.grpc.android.integrationtest" > package="io.grpc.android.integrationtest" >
<!-- API level 14+ is required for TLS since Google Play Services v10.2 -->
<uses-sdk
android:minSdkVersion="14"
android:targetSdkVersion="22"/>
<uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.INTERNET" />
<application <application

4
android-interop-testing/build.gradle
View File

@ -3,9 +3,10 @@
buildscript { buildscript {
repositories { repositories {
jcenter() jcenter()
google()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:2.3.1' classpath 'com.android.tools.build:gradle:3.0.1'
classpath "com.google.protobuf:protobuf-gradle-plugin:0.8.3" classpath "com.google.protobuf:protobuf-gradle-plugin:0.8.3"
// NOTE: Do not place your application dependencies here; they belong // NOTE: Do not place your application dependencies here; they belong
@ -17,6 +18,7 @@ allprojects {
repositories { repositories {
mavenLocal() mavenLocal()
jcenter() jcenter()
google()
} }
} }