Skip to content

Commit 1fc06fb

Browse files
committed
Update dependencies
1 parent 6a3a9c3 commit 1fc06fb

4 files changed

Lines changed: 60 additions & 17 deletions

File tree

build.gradle

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

2020
buildscript {
21+
ext.android_gradle_plugin_version = '3.6.1'
2122
ext.androidx_annotation_version = '1.1.0'
2223
ext.androidx_appcompat_version = '1.1.0'
23-
ext.androidx_core_version = '1.1.0'
24-
ext.androidx_fragment_version = '1.1.0'
24+
ext.androidx_core_version = '1.2.0'
25+
ext.androidx_fragment_version = '1.2.3'
2526
ext.androidx_recyclerview_version = '1.1.0'
2627
ext.compile_sdk_version = 29
2728
ext.java_version = '1.8'
@@ -34,10 +35,7 @@ buildscript {
3435
}
3536

3637
dependencies {
37-
classpath 'com.android.tools.build:gradle:3.5.3'
38-
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
39-
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
40-
classpath 'com.novoda:bintray-release:0.9.1'
38+
classpath "com.android.tools.build:gradle:$android_gradle_plugin_version"
4139
// NOTE: Do not place your application dependencies here; they belong
4240
// in the individual module build.gradle files
4341
}

gradle.properties

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,6 @@ org.gradle.jvmargs=-Xmx1536m
1414
# When configured, Gradle will run in incubating parallel mode.
1515
# This option should only be used with decoupled projects. More details, visit
1616
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
17-
# org.gradle.parallel=true
17+
# org.gradle.parallel=true
18+
19+
android.useAndroidX=true

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@
1616
#
1717
distributionBase=GRADLE_USER_HOME
1818
distributionPath=wrapper/dists
19-
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
19+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-all.zip
2020
zipStoreBase=GRADLE_USER_HOME
2121
zipStorePath=wrapper/dists

tableview/build.gradle

Lines changed: 52 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
apply plugin: 'com.android.library'
2-
apply plugin: 'com.novoda.bintray-release'
32

43
android {
54
compileSdkVersion compile_sdk_version
@@ -8,7 +7,7 @@ android {
87
minSdkVersion min_sdk_version
98
targetSdkVersion target_sdk_version
109
versionCode 1
11-
versionName '1.0'
10+
versionName '0.8.9'
1211
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
1312
}
1413

@@ -47,11 +46,55 @@ dependencies {
4746
implementation "androidx.recyclerview:recyclerview:$androidx_recyclerview_version"
4847
}
4948

50-
publish {
51-
userOrg = 'evrencoskun' //user name of bintray.com
52-
groupId = 'com.evrencoskun.library' //jcenter's url
53-
artifactId = 'tableview' //project name
54-
publishVersion = '0.8.9' //version code
55-
desc = 'TableView is a powerful Android library for displaying complex data structures and rendering tabular data composed of rows, columns and cells.'
56-
website = 'https://github.com/evrencoskun/TableView' //website
49+
// Configure the publishing
50+
apply plugin: 'maven-publish'
51+
52+
task androidJavadocs(type: Javadoc) {
53+
source = android.sourceSets.main.java.srcDirs
54+
classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
55+
android.libraryVariants.all { variant ->
56+
if (variant.name == 'release') {
57+
owner.classpath += variant.javaCompileProvider.get().classpath
58+
}
59+
}
60+
exclude '**/R.html', '**/R.*.html', '**/index.html'
61+
}
62+
63+
task androidJavadocsJar(type: Jar, dependsOn: androidJavadocs) {
64+
archiveClassifier.set('javadoc')
65+
from androidJavadocs.destinationDir
66+
}
67+
68+
task androidSourcesJar(type: Jar) {
69+
archiveClassifier.set('sources')
70+
from android.sourceSets.main.java.srcDirs
71+
}
72+
73+
afterEvaluate {
74+
publishing {
75+
publications {
76+
release(MavenPublication) {
77+
from components.release
78+
79+
groupId = 'com.evrencoskun.library'
80+
artifactId = 'tableview'
81+
version = android.defaultConfig.versionName
82+
83+
artifact androidJavadocsJar
84+
artifact androidSourcesJar
85+
86+
pom {
87+
name = 'TableView'
88+
description = 'TableView is a powerful Android library for displaying complex data structures and rendering tabular data composed of rows, columns and cells.'
89+
url = 'https://github.com/evrencoskun/TableView'
90+
}
91+
}
92+
}
93+
94+
repositories {
95+
maven {
96+
url = 'https://api.bintray.com/content/evrencoskun/artifact-sandbox/'
97+
}
98+
}
99+
}
57100
}

0 commit comments

Comments
 (0)