Skip to content
This repository was archived by the owner on Feb 9, 2023. It is now read-only.

Commit eeeab6b

Browse files
committed
Update gradle version, build properties (#1)
1 parent ccf9508 commit eeeab6b

File tree

8 files changed

+27
-30
lines changed

8 files changed

+27
-30
lines changed

build.gradle

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@
22

33
buildscript {
44
repositories {
5+
google()
56
jcenter()
67
}
78
dependencies {
8-
classpath 'com.android.tools.build:gradle:3.0.0-alpha4'
9+
classpath 'com.android.tools.build:gradle:3.2.1'
910

1011
// For Bintray publishing
1112
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.2'
@@ -15,6 +16,7 @@ buildscript {
1516

1617
allprojects {
1718
repositories {
19+
google()
1820
jcenter()
1921
}
2022
}

gradle.properties

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,5 @@
1717
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
1818
# org.gradle.parallel=true
1919
compileSdkVersion = 26
20-
targetSdkVersion = 25
21-
buildToolsVersion = 25.0.3
22-
supportLibVersion = 24.2.0
20+
targetSdkVersion = 26
21+
supportLibVersion = 26.1.0
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Sat Jun 24 21:38:23 PDT 2017
1+
#Tue Nov 13 00:07:04 KST 2018
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.0-rc-1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip

hover/build.gradle

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ version = '0.9.8'
55

66
android {
77
compileSdkVersion project.compileSdkVersion.toInteger()
8-
buildToolsVersion project.buildToolsVersion
98

109
defaultConfig {
1110
minSdkVersion 15
@@ -21,11 +20,11 @@ android {
2120
}
2221

2322
dependencies {
24-
compile fileTree(dir: 'libs', include: ['*.jar'])
25-
compile "com.android.support:appcompat-v7:${supportLibVersion}"
26-
compile "com.android.support:recyclerview-v7:${supportLibVersion}" // Used to get DiffUtil
23+
implementation fileTree(dir: 'libs', include: ['*.jar'])
24+
api "com.android.support:appcompat-v7:${supportLibVersion}"
25+
api "com.android.support:recyclerview-v7:${supportLibVersion}" // Used to get DiffUtil
2726

28-
testCompile 'junit:junit:4.12'
27+
testImplementation 'junit:junit:4.12'
2928
}
3029

3130
// For Bintray publishing

hoverdemo-helloworld/build.gradle

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ apply plugin: 'com.android.application'
22

33
android {
44
compileSdkVersion project.compileSdkVersion.toInteger()
5-
buildToolsVersion project.buildToolsVersion
65

76
defaultConfig {
87
applicationId "org.codecanon.hover.hoverdemo.helloworld"
@@ -23,6 +22,6 @@ android {
2322
}
2423

2524
dependencies {
26-
compile fileTree(dir: 'libs', include: ['*.jar'])
27-
compile project(':hover')
25+
implementation fileTree(dir: 'libs', include: ['*.jar'])
26+
implementation project(':hover')
2827
}

hoverdemo-helloworld/src/main/java/io/mattcarroll/hover/hoverdemo/helloworld/SingleSectionNotificationHoverMenuService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import android.content.Intent;
2121
import android.support.annotation.NonNull;
2222
import android.support.annotation.Nullable;
23-
import android.support.v7.app.NotificationCompat;
23+
import android.support.v4.app.NotificationCompat;
2424
import android.view.View;
2525
import android.widget.ImageView;
2626

hoverdemo-kitchensink/build.gradle

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ apply plugin: 'com.android.application'
22

33
android {
44
compileSdkVersion project.compileSdkVersion.toInteger()
5-
buildToolsVersion project.buildToolsVersion
65

76
defaultConfig {
87
applicationId "io.mattcarroll.hover.hoverdemo"
@@ -20,12 +19,12 @@ android {
2019
}
2120

2221
dependencies {
23-
compile fileTree(dir: 'libs', include: ['*.jar'])
24-
testCompile 'junit:junit:4.12'
25-
compile "com.android.support:appcompat-v7:${supportLibVersion}"
26-
compile "com.android.support:design:${supportLibVersion}"
27-
compile "com.android.support:recyclerview-v7:${supportLibVersion}"
28-
compile 'de.greenrobot:eventbus:2.4.0'
29-
compile 'com.larswerkman:HoloColorPicker:1.5'
30-
compile project(':hover')
22+
implementation fileTree(dir: 'libs', include: ['*.jar'])
23+
testImplementation 'junit:junit:4.12'
24+
implementation "com.android.support:appcompat-v7:${supportLibVersion}"
25+
implementation "com.android.support:design:${supportLibVersion}"
26+
implementation "com.android.support:recyclerview-v7:${supportLibVersion}"
27+
implementation 'de.greenrobot:eventbus:2.4.0'
28+
implementation 'com.larswerkman:HoloColorPicker:1.5'
29+
implementation project(':hover')
3130
}

hoverdemo-nonfullscreen/build.gradle

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ apply plugin: 'com.android.application'
22

33
android {
44
compileSdkVersion project.compileSdkVersion.toInteger()
5-
buildToolsVersion project.buildToolsVersion
65

76
defaultConfig {
87
applicationId "io.mattcarroll.hoverdemonon_fullscreen"
@@ -23,13 +22,13 @@ android {
2322
}
2423

2524
dependencies {
26-
compile fileTree(dir: 'libs', include: ['*.jar'])
27-
compile "com.android.support:appcompat-v7:${supportLibVersion}"
28-
compile project(':hover')
25+
implementation fileTree(dir: 'libs', include: ['*.jar'])
26+
implementation "com.android.support:appcompat-v7:${supportLibVersion}"
27+
implementation project(':hover')
2928

30-
testCompile 'junit:junit:4.12'
29+
testImplementation 'junit:junit:4.12'
3130

32-
androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
31+
androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
3332
exclude group: 'com.android.support', module: 'support-annotations'
3433
})
3534
}

0 commit comments

Comments
 (0)