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

Update gradle version, build properties #1

Merged
merged 4 commits into from
Dec 3, 2018
Merged

Update gradle version, build properties #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
964ae7a
fix build
SeoJungHong Nov 14, 2018
8f490f6
build warning 제거
SeoJungHong Nov 15, 2018
93edf35
fix build error
SeoJungHong Nov 15, 2018
a1b2339
너무 높은 버전 말고 26 사용
SeoJungHong Nov 23, 2018
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
4 changes: 3 additions & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@

buildscript {
repositories {
google()
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.0.0-alpha4'
classpath 'com.android.tools.build:gradle:3.2.1'

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

allprojects {
repositories {
google()
jcenter()
}
}
Expand Down
5 changes: 2 additions & 3 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,5 @@
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
# org.gradle.parallel=true
compileSdkVersion = 26
targetSdkVersion = 25
buildToolsVersion = 25.0.3
supportLibVersion = 24.2.0
targetSdkVersion = 26
supportLibVersion = 26.1.0
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Sat Jun 24 21:38:23 PDT 2017
#Tue Nov 13 00:07:04 KST 2018
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.0-rc-1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip
9 changes: 4 additions & 5 deletions hover/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ version = '0.9.8'

android {
compileSdkVersion project.compileSdkVersion.toInteger()
buildToolsVersion project.buildToolsVersion

defaultConfig {
minSdkVersion 15
Expand All @@ -21,11 +20,11 @@ android {
}

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

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

// For Bintray publishing
Expand Down
5 changes: 2 additions & 3 deletions hoverdemo-helloworld/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ apply plugin: 'com.android.application'

android {
compileSdkVersion project.compileSdkVersion.toInteger()
buildToolsVersion project.buildToolsVersion

defaultConfig {
applicationId "org.codecanon.hover.hoverdemo.helloworld"
Expand All @@ -23,6 +22,6 @@ android {
}

dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
compile project(':hover')
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation project(':hover')
}
2 changes: 1 addition & 1 deletion .../io/mattcarroll/hover/hoverdemo/helloworld/SingleSectionNotificationHoverMenuService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
import android.content.Intent;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.v7.app.NotificationCompat;
import android.support.v4.app.NotificationCompat;
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

min sdk target 이 몇시요? v7 으로 사용해도 괜찮지 않을까요?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

android.support.v7.app.NotificationCompat 은 android.support.v4.app.NotificationCompat 을 상속받아서 쓰고 deprecate 되어 있었는데 support lib version 이 26 에서 27 로 올라가면서 아예 삭제되어서 빌드 에러가 났습니다. https://stackoverflow.com/questions/38249970/how-to-import-android-support-v7-app-notificationcompat-builder-class-in-android 여기도 참고했고요. 가이드에서는 언제 삭제되었는지 히스토리를 찾을 수가 없었지만 일단 현재는 https://developer.android.com/reference/android/support/v4/app/NotificationCompat.Builder 이렇게 v4 의 NotificationCompat 만 찾을 수가 있었습니다.

import android.view.View;
import android.widget.ImageView;

Expand Down
17 changes: 8 additions & 9 deletions hoverdemo-kitchensink/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ apply plugin: 'com.android.application'

android {
compileSdkVersion project.compileSdkVersion.toInteger()
buildToolsVersion project.buildToolsVersion

defaultConfig {
applicationId "io.mattcarroll.hover.hoverdemo"
Expand All @@ -20,12 +19,12 @@ android {
}

dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
testCompile 'junit:junit:4.12'
compile "com.android.support:appcompat-v7:${supportLibVersion}"
compile "com.android.support:design:${supportLibVersion}"
compile "com.android.support:recyclerview-v7:${supportLibVersion}"
compile 'de.greenrobot:eventbus:2.4.0'
compile 'com.larswerkman:HoloColorPicker:1.5'
compile project(':hover')
implementation fileTree(dir: 'libs', include: ['*.jar'])
testImplementation 'junit:junit:4.12'
implementation "com.android.support:appcompat-v7:${supportLibVersion}"
implementation "com.android.support:design:${supportLibVersion}"
implementation "com.android.support:recyclerview-v7:${supportLibVersion}"
implementation 'de.greenrobot:eventbus:2.4.0'
implementation 'com.larswerkman:HoloColorPicker:1.5'
implementation project(':hover')
}
11 changes: 5 additions & 6 deletions hoverdemo-nonfullscreen/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ apply plugin: 'com.android.application'

android {
compileSdkVersion project.compileSdkVersion.toInteger()
buildToolsVersion project.buildToolsVersion

defaultConfig {
applicationId "io.mattcarroll.hoverdemonon_fullscreen"
Expand All @@ -23,13 +22,13 @@ android {
}

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

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

androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
exclude group: 'com.android.support', module: 'support-annotations'
})
}