Skip to content

Commit 46daf50

Browse files
authored
Update dependencies (#11)
* Dump Travis for GitHub Actions * Remove useless variables * Update Kotlin to 1.4.10, compile and target versions to 30, gradle wrapper to 6.3 * Add buildSrc to define project setup constants * Convert subprojects' build.gradle to Kotlin
1 parent 69b3aa1 commit 46daf50

File tree

9 files changed

+114
-97
lines changed

9 files changed

+114
-97
lines changed

app/build.gradle

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

app/build.gradle.kts

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
plugins {
2+
id("com.android.application")
3+
id("jacoco-android")
4+
id("kotlin-android")
5+
id("kotlin-android-extensions")
6+
}
7+
8+
android {
9+
setCompileSdkVersion(AndroidModuleSpecs.compileSdkVersion)
10+
11+
defaultConfig {
12+
setTargetSdkVersion(AndroidModuleSpecs.targetSdkVersion)
13+
setMinSdkVersion(19)
14+
versionCode = 1
15+
versionName = "1.0.0"
16+
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
17+
}
18+
buildTypes {
19+
maybeCreate("release").apply {
20+
isMinifyEnabled = true
21+
proguardFiles(getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro")
22+
}
23+
}
24+
}
25+
26+
repositories {
27+
maven(url = "https://jitpack.io")
28+
}
29+
30+
dependencies {
31+
val kotlinVersion: String by project
32+
implementation(project(":avvylib"))
33+
implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion")
34+
implementation("androidx.appcompat:appcompat:1.2.0")
35+
implementation("androidx.exifinterface:exifinterface:1.3.0")
36+
implementation("androidx.constraintlayout:constraintlayout:2.0.2")
37+
implementation("com.github.QuadFlask:colorpicker:0.0.13")
38+
implementation("com.xw.repo:bubbleseekbar:3.19")
39+
implementation("com.squareup.picasso:picasso:2.71828")
40+
testImplementation("junit:junit:4.12")
41+
androidTestImplementation("androidx.test:core:1.3.0")
42+
androidTestImplementation("androidx.test.espresso:espresso-core:3.3.0")
43+
}

avvylib/build.gradle

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

avvylib/build.gradle.kts

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
plugins {
2+
id("com.android.library")
3+
id("kotlin-android")
4+
id("jacoco-android")
5+
id("com.github.panpf.bintray-publish")
6+
}
7+
val kotlinVersion: String by project
8+
val version = "1.1.0"
9+
android {
10+
setCompileSdkVersion(AndroidModuleSpecs.compileSdkVersion)
11+
12+
defaultConfig {
13+
setTargetSdkVersion(AndroidModuleSpecs.targetSdkVersion)
14+
setMinSdkVersion(AndroidModuleSpecs.minSdkVersion)
15+
versionCode = 1
16+
versionName = version
17+
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
18+
}
19+
20+
buildTypes {
21+
maybeCreate("release").apply {
22+
isMinifyEnabled = true
23+
proguardFiles(getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro")
24+
}
25+
}
26+
}
27+
28+
configure<com.github.panpf.bintray.publish.PublishExtension> {
29+
userOrg = "vitorhugods"
30+
repoName = "AvatarView"
31+
groupId = "xyz.schwaab"
32+
artifactId = "avvylib"
33+
publishVersion = version
34+
desc = "A circular ImageView with border, progress animation and customizable highlights for Android"
35+
website = "https://github.com/vitorhugods/AvatarView"
36+
}
37+
38+
repositories {
39+
mavenCentral()
40+
}
41+
42+
dependencies {
43+
compileOnly("androidx.annotation:annotation:1.1.0")
44+
implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion")
45+
testImplementation("junit:junit:4.12")
46+
androidTestImplementation("androidx.test:core:1.3.0")
47+
androidTestImplementation("androidx.test.espresso:espresso-core:3.3.0")
48+
}

build.gradle

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22

33
buildscript {
4-
ext.kotlin_version = '1.3.61'
4+
ext.kotlinVersion = '1.4.10'
55
repositories {
66
google()
77
jcenter()
88
maven { url 'https://maven.google.com' }
9+
maven { url 'https://oss.jfrog.org/artifactory/oss-snapshot-local' }
910
}
1011
dependencies {
11-
classpath 'com.android.tools.build:gradle:3.6.0'
12-
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
13-
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
14-
classpath 'com.dicedmelon.gradle:jacoco-android:0.1.4'
15-
classpath 'com.novoda:bintray-release:0.9.2'
12+
classpath 'com.android.tools.build:gradle:4.0.2'
13+
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
14+
classpath 'com.dicedmelon.gradle:jacoco-android:0.1.5-SNAPSHOT'
15+
classpath 'com.github.panpf.bintray-publish:bintray-publish:1.0.0'
1616
// NOTE: Do not place your application dependencies here; they belong
1717
// in the individual module build.gradle files
1818
}

buildSrc/.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
/build
2+
/.gradle

buildSrc/build.gradle.kts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
plugins {
2+
`kotlin-dsl`
3+
}
4+
5+
repositories {
6+
jcenter()
7+
google()
8+
}
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
object AndroidModuleSpecs {
2+
const val compileSdkVersion = 30
3+
const val targetSdkVersion = 30
4+
const val minSdkVersion = 14
5+
}
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Mon Feb 24 16:48:46 CET 2020
1+
#Sun Oct 11 23:02:27 CEST 2020
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-5.6.4-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-all.zip

0 commit comments

Comments
 (0)