Skip to content

Commit 10472ea

Browse files
skydovesskydoves
committed
Remove jcenter publishing tasks and migrate to maven
1 parent 6a26876 commit 10472ea

File tree

7 files changed

+75
-171
lines changed

7 files changed

+75
-171
lines changed

‎androidveil/build.gradle

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
apply plugin: 'com.android.library'
22
apply plugin: 'kotlin-android'
3-
apply plugin: 'org.jetbrains.dokka'
43
apply from: "$rootDir/dependencies.gradle"
5-
apply from: "$rootDir/publish.gradle"
64

75
android {
86
compileSdkVersion versions.compileSdk
@@ -24,17 +22,5 @@ dependencies {
2422
api "com.facebook.shimmer:shimmer:$versions.shimmer"
2523
}
2624

27-
dokka {
28-
outputFormat = 'html'
29-
outputDirectory = "$buildDir/javadoc"
30-
configuration {
31-
moduleName = 'androidveil'
32-
}
33-
}
34-
35-
tasks.withType(Javadoc) {
36-
excludes = ['**/*.kt']
37-
options.addBooleanOption('Xdoclint:none', true)
38-
}
39-
40-
apply from: "$rootDir/spotless.gradle"
25+
apply plugin: "com.vanniktech.maven.publish"
26+
apply from: '../spotless.gradle'

‎androidveil/src/main/java/com/skydoves/androidveil/VeiledAdapter.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,15 +67,15 @@ internal class VeiledAdapter(
6767
}
6868
}
6969

70-
private fun getVeilParams(position: Int): VeilParams = this.veilParamList[position]
70+
private fun getVeilParams(position: Int): VeilParams = veilParamList[position]
7171

7272
fun updateParams(params: List<VeilParams>) {
7373
veilParamList.clear()
7474
veilParamList.addAll(params)
7575
notifyDataSetChanged()
7676
}
7777

78-
override fun getItemCount() = this.veilParamList.size
78+
override fun getItemCount() = veilParamList.size
7979

8080
class VeiledViewHolder(val binding: ItemVeiledLayoutAndroidveilSkydovesBinding) :
8181
RecyclerView.ViewHolder(binding.root)

‎app/src/main/res/layout/item_profile.xml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
33
android:layout_width="match_parent"
44
android:layout_height="wrap_content"
5-
android:layout_margin="13dp"
5+
android:layout_marginStart="13dp"
6+
android:layout_marginTop="13dp"
7+
android:layout_marginEnd="13dp"
68
android:background="?attr/selectableItemBackground"
79
android:orientation="horizontal">
810

@@ -15,7 +17,10 @@
1517
<LinearLayout
1618
android:layout_width="match_parent"
1719
android:layout_height="wrap_content"
20+
android:layout_marginStart="10dp"
1821
android:layout_marginLeft="10dp"
22+
android:layout_marginEnd="10dp"
23+
android:layout_marginRight="10dp"
1924
android:background="?attr/selectableItemBackground"
2025
android:orientation="vertical">
2126

@@ -31,10 +36,13 @@
3136
<androidx.appcompat.widget.AppCompatTextView
3237
android:id="@+id/content"
3338
android:layout_width="match_parent"
34-
android:layout_height="35dp"
39+
android:layout_height="wrap_content"
3540
android:layout_marginTop="7dp"
3641
android:maxLines="2"
42+
android:minHeight="35dp"
3743
android:textColor="@android:color/white"
3844
android:textSize="14sp" />
45+
3946
</LinearLayout>
47+
4048
</LinearLayout>

‎build.gradle

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,22 @@ buildscript {
22
apply from: "$rootDir/dependencies.gradle"
33
repositories {
44
google()
5+
mavenCentral()
56
jcenter()
67
}
78
dependencies {
89
classpath "com.android.tools.build:gradle:$versions.gradleBuildTool"
910
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$versions.kotlin"
1011
classpath "com.diffplug.spotless:spotless-plugin-gradle:$versions.spotlessGradle"
11-
classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:$versions.bintrayPlugin"
12+
classpath "com.vanniktech:gradle-maven-publish-plugin:$versions.mavenPublish"
1213
classpath "org.jetbrains.dokka:dokka-gradle-plugin:$versions.dokkaGradle"
1314
}
1415
}
1516

1617
allprojects {
1718
repositories {
1819
google()
20+
mavenCentral()
1921
jcenter()
2022
}
2123
}

‎dependencies.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ ext.versions = [
44
versionCode : 12,
55
versionName : '1.1.1',
66

7-
gradleBuildTool : '4.0.1',
8-
spotlessGradle : '5.8.2',
9-
ktlintGradle : '0.39.0',
10-
dokkaGradle : '0.10.1',
11-
bintrayPlugin : '1.8.5',
7+
gradleBuildTool : '4.1.1',
8+
spotlessGradle : '5.9.0',
9+
ktlintGradle : '0.40.0',
10+
dokkaGradle : '1.4.20',
11+
mavenPublish : '0.13.0',
1212

1313
kotlin : '1.4.20',
1414
androidxAppcompat: '1.2.0',

‎gradle.properties

Lines changed: 53 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,54 @@
1-
# Project-wide Gradle settings.
2-
# IDE (e.g. Android Studio) users:
3-
# Gradle settings configured through the IDE *will override*
4-
# any settings specified in this file.
5-
# For more details on how to configure your build environment visit
6-
# http://www.gradle.org/docs/current/userguide/build_environment.html
7-
# Specifies the JVM arguments used for the daemon process.
8-
# The setting is particularly useful for tweaking memory settings.
9-
android.enableJetifier=true
1+
#
2+
# Copyright 2018 skydoves (Jaewoong Eum)
3+
#
4+
# Licensed under the Apache License, Version 2.0 (the "License");
5+
# you may not use this file except in compliance with the License.
6+
# You may obtain a copy of the License at
7+
#
8+
# http://www.apache.org/licenses/LICENSE-2.0
9+
#
10+
# Unless required by applicable law or agreed to in writing, software
11+
# distributed under the License is distributed on an "AS IS" BASIS,
12+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
# See the License for the specific language governing permissions and
14+
# limitations under the License.
15+
#
16+
17+
# Jvm environments
18+
org.gradle.jvmargs=-Xmx4g
19+
20+
# AndroidX
1021
android.useAndroidX=true
11-
org.gradle.jvmargs=-Xmx1536m
12-
# When configured, Gradle will run in incubating parallel mode.
13-
# This option should only be used with decoupled projects. More details, visit
14-
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
15-
# org.gradle.parallel=true
22+
23+
# Required to publish to Nexus
24+
systemProp.org.gradle.internal.publish.checksums.insecure=true
25+
26+
# Increase timeout when pushing to Sonatype
27+
systemProp.org.gradle.internal.http.connectionTimeout=120000
28+
systemProp.org.gradle.internal.http.socketTimeout=120000
29+
30+
# Maven
31+
GROUP=com.github.skydoves
32+
POM_PACKAGING=aar
33+
34+
VERSION_NAME=1.1.2-SNAPSHOT
35+
36+
POM_ARTIFACT_ID=androidveil
37+
POM_NAME=androidveil
38+
POM_DESCRIPTION=An easy, flexible way to implement veil skeletons and shimmering effect for Android.
39+
40+
POM_URL=https://github.com/skydoves/androidveil/
41+
POM_SCM_URL=https://github.com/skydoves/androidveil/
42+
POM_SCM_CONNECTION=scm:git:git://github.com/skydoves/androidveil.git
43+
POM_SCM_DEV_CONNECTION=scm:git:git://github.com/skydoves/androidveil.git
44+
45+
POM_LICENCE_NAME=The Apache Software License, Version 2.0
46+
POM_LICENCE_URL=http://www.apache.org/licenses/LICENSE-2.0.txt
47+
POM_LICENCE_DIST=repo
48+
49+
POM_DEVELOPER_ID=skydoves
50+
POM_DEVELOPER_NAME=Jaewoong Eum
51+
POM_DEVELOPER_URL=https://github.com/skydoves/
52+
53+
RELEASE_REPOSITORY_URL=https://oss.sonatype.org/service/local/staging/deploy/maven2/
54+
SNAPSHOT_REPOSITORY_URL=https://oss.sonatype.org/content/repositories/snapshots/

‎publish.gradle

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

0 commit comments

Comments
 (0)