Skip to content

Commit

Permalink
Updates android projects for Android Studio 3.1
Browse files Browse the repository at this point in the history
  • Loading branch information
pepone committed Apr 19, 2018
1 parent 9d3601b commit ed979fd
Show file tree
Hide file tree
Showing 12 changed files with 21 additions and 21 deletions.
2 changes: 1 addition & 1 deletion java-compat/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ buildscript {
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.0.1'
classpath 'com.android.tools.build:gradle:3.1.1'
}
}

Expand Down
6 changes: 3 additions & 3 deletions java-compat/android/chat/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ slice {

android {
compileSdkVersion 21
buildToolsVersion "27.0.1"
buildToolsVersion '27.0.3'

defaultConfig {
applicationId "com.zeroc.chat"
Expand Down Expand Up @@ -51,6 +51,6 @@ clean {
}

dependencies {
compile 'com.zeroc:ice-compat:3.7.1'
compile 'com.zeroc:glacier2-compat:3.7.1'
implementation 'com.zeroc:ice-compat:3.7.1'
implementation 'com.zeroc:glacier2-compat:3.7.1'
}
6 changes: 3 additions & 3 deletions java-compat/android/hello/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ slice {

android {
compileSdkVersion 21
buildToolsVersion "27.0.1"
buildToolsVersion '27.0.3'

defaultConfig {
applicationId "com.zeroc.hello"
Expand Down Expand Up @@ -50,6 +50,6 @@ clean {
}

dependencies {
compile 'com.zeroc:ice-compat:3.7.1'
compile 'com.zeroc:icediscovery-compat:3.7.1'
implementation 'com.zeroc:ice-compat:3.7.1'
implementation 'com.zeroc:icediscovery-compat:3.7.1'
}
6 changes: 3 additions & 3 deletions java-compat/android/library/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ slice {

android {
compileSdkVersion 21
buildToolsVersion "27.0.1"
buildToolsVersion '27.0.3'

defaultConfig {
applicationId "com.zeroc.library"
Expand Down Expand Up @@ -51,6 +51,6 @@ clean {
}

dependencies {
compile 'com.zeroc:ice-compat:3.7.1'
compile 'com.zeroc:glacier2-compat:3.7.1'
implementation 'com.zeroc:ice-compat:3.7.1'
implementation 'com.zeroc:glacier2-compat:3.7.1'
}
4 changes: 2 additions & 2 deletions java-compat/android/mtalk/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ slice {

android {
compileSdkVersion 21
buildToolsVersion "27.0.1"
buildToolsVersion '27.0.3'

defaultConfig {
applicationId "com.zeroc.mtalk"
Expand Down Expand Up @@ -54,5 +54,5 @@ clean {
}

dependencies {
compile 'com.zeroc:ice-compat:3.7.1'
implementation 'com.zeroc:ice-compat:3.7.1'
}
6 changes: 3 additions & 3 deletions java-compat/android/talk/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ slice {

android {
compileSdkVersion 21
buildToolsVersion "27.0.1"
buildToolsVersion '27.0.3'

defaultConfig {
applicationId "com.zeroc.talk"
Expand All @@ -44,6 +44,6 @@ android {
}

dependencies {
compile 'com.zeroc:ice-compat:3.7.1'
compile 'com.zeroc:icebt-compat:3.7.1'
implementation 'com.zeroc:ice-compat:3.7.1'
implementation 'com.zeroc:icebt-compat:3.7.1'
}
2 changes: 1 addition & 1 deletion java/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ buildscript {
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.0.1'
classpath 'com.android.tools.build:gradle:3.1.1'
}
}

Expand Down
2 changes: 1 addition & 1 deletion java/android/chat/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ slice {

android {
compileSdkVersion 24
buildToolsVersion "27.0.1"
buildToolsVersion '27.0.3'

defaultConfig {
applicationId "com.zeroc.chat"
Expand Down
2 changes: 1 addition & 1 deletion java/android/hello/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ slice {

android {
compileSdkVersion 24
buildToolsVersion "27.0.1"
buildToolsVersion '27.0.3'

defaultConfig {
applicationId "com.zeroc.hello"
Expand Down
2 changes: 1 addition & 1 deletion java/android/library/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ slice {

android {
compileSdkVersion 24
buildToolsVersion "27.0.1"
buildToolsVersion '27.0.3'

defaultConfig {
applicationId "com.zeroc.library"
Expand Down
2 changes: 1 addition & 1 deletion java/android/mtalk/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ slice {

android {
compileSdkVersion 24
buildToolsVersion "27.0.1"
buildToolsVersion '27.0.3'

defaultConfig {
applicationId "com.zeroc.mtalk"
Expand Down
2 changes: 1 addition & 1 deletion java/android/talk/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ slice {

android {
compileSdkVersion 24
buildToolsVersion '27.0.1'
buildToolsVersion '27.0.3'

defaultConfig {
applicationId "com.zeroc.talk"
Expand Down

0 comments on commit ed979fd

Please # to comment.