Skip to content

Commit 268189b

Browse files
committed
Migrate to build.gradle.kts and update dependencies
1 parent cb5be56 commit 268189b

25 files changed

Lines changed: 263 additions & 253 deletions

File tree

.gitignore

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,14 @@
1+
*.iml
12
.gradle
2-
/local.properties
3-
/.idea/workspace.xml
4-
/.idea/libraries
3+
local.properties
54
.DS_Store
6-
/build
7-
/captures
8-
*.iml
9-
.idea
5+
build
6+
captures
7+
build.number
8+
build.properties
9+
etc/apk
10+
etc/proguard
11+
12+
.idea/*
13+
!.idea/codeStyles/
14+
!.idea/copyright/

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# Changelog
22

3+
## v2.2.3 (2021-01-02)
4+
- Support for rotary input
5+
- Updated dependencies to latest versions and use gradle.kts
6+
37
## v2.2.2 (2019-09-07)
48
- Migration to AndroidX
59

README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,16 +26,16 @@ repositories {
2626
(...)
2727
2828
dependencies {
29-
compile 'org.jraf:android-wear-color-picker:2.2.2'
29+
compile 'org.jraf:android-wear-color-picker:2.2.3'
3030
}
3131
```
3232

3333
The library uses [Android Data Binding](https://developer.android.com/jetpack/androidx/releases/databinding) -
34-
make sure your `build.gradle` files declare that:
34+
make sure your `build.gradle` declare that:
3535
```groovy
3636
android {
37-
dataBinding {
38-
enabled = true
37+
buildFeatures {
38+
dataBinding = true
3939
}
4040
}
4141
```
@@ -79,7 +79,7 @@ License
7979
---
8080

8181
```
82-
Copyright (C) 2015-2019 Benoit 'BoD' Lubek (BoD@JRAF.org)
82+
Copyright (C) 2015-present Benoit 'BoD' Lubek (BoD@JRAF.org)
8383
8484
Licensed under the Apache License, Version 2.0 (the "License");
8585
you may not use this file except in compliance with the License.

build.gradle

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

build.gradle.kts

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
import com.github.benmanes.gradle.versions.updates.DependencyUpdatesTask
2+
3+
plugins {
4+
id("com.github.ben-manes.versions") version Versions.BEN_MANES_VERSIONS_PLUGIN
5+
}
6+
7+
buildscript {
8+
repositories {
9+
google()
10+
jcenter()
11+
}
12+
13+
dependencies {
14+
classpath("com.android.tools.build", "gradle", Versions.ANDROID_GRADLE_PLUGIN)
15+
classpath(kotlin("gradle-plugin", Versions.KOTLIN))
16+
classpath("com.jfrog.bintray.gradle", "gradle-bintray-plugin", Versions.BINTRAY_PUBLISH_PLUGIN)
17+
}
18+
}
19+
20+
allprojects {
21+
repositories {
22+
mavenLocal()
23+
google()
24+
jcenter()
25+
}
26+
27+
// Show a report in the log when running tests
28+
tasks.withType<Test> {
29+
testLogging {
30+
events("passed", "skipped", "failed", "standardOut", "standardError")
31+
}
32+
}
33+
}
34+
35+
tasks {
36+
register<Delete>("clean") {
37+
delete(rootProject.buildDir)
38+
}
39+
40+
wrapper {
41+
distributionType = Wrapper.DistributionType.ALL
42+
gradleVersion = Versions.GRADLE
43+
}
44+
45+
// Configuration for gradle-versions-plugin
46+
// Run `./gradlew dependencyUpdates` to see latest versions of dependencies
47+
withType<DependencyUpdatesTask> {
48+
resolutionStrategy {
49+
componentSelection {
50+
all {
51+
if (setOf("alpha", "beta", "rc", "preview", "eap", "m1").any { candidate.version.contains(it, true) }) {
52+
reject("Non stable")
53+
}
54+
}
55+
}
56+
}
57+
}
58+
}

buildSrc/build.gradle.kts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
// https://docs.gradle.org/current/userguide/kotlin_dsl.html#sec:kotlin-dsl_plugin
2+
plugins {
3+
`kotlin-dsl`
4+
}
5+
6+
repositories {
7+
jcenter()
8+
}
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
object Versions {
2+
const val GRADLE = "6.7.1"
3+
const val KOTLIN = "1.4.21-2"
4+
const val BEN_MANES_VERSIONS_PLUGIN = "0.36.0"
5+
const val BINTRAY_PUBLISH_PLUGIN = "1.8.5"
6+
const val ANDROID_GRADLE_PLUGIN = "4.1.1"
7+
const val ANDROIDX_WEAR = "1.1.0"
8+
const val GOOGLE_WEARABLE = "2.8.1"
9+
const val GOOGLE_SUPPORT_WEARABLE = "2.8.1"
10+
const val ANDROIDX_CONSTRAINT_LAYOUT = "2.0.4"
11+
const val PLAY_SERVICE_WEARABLE = "17.0.0"
12+
}

gradle/wrapper/gradle-wrapper.jar

3.5 KB
Binary file not shown.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

gradlew

Lines changed: 17 additions & 20 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)