Skip to content

Commit d3986d1

Browse files
authored
Merge pull request #19 from skydoves/update/dependencies
Update: dependencies
2 parents f4207a9 + f32161f commit d3986d1

File tree

12 files changed

+127
-50
lines changed

12 files changed

+127
-50
lines changed

.github/workflows/android.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ jobs:
1515

1616
steps:
1717
- uses: actions/checkout@v2
18-
- name: set up JDK 1.8
18+
- name: set up JDK
1919
uses: actions/setup-java@v1
2020
with:
21-
java-version: 1.8
21+
java-version: 11
2222
- name: Make Gradle executable
2323
run: chmod +x ./gradlew
2424
- name: Build with Gradle

README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ An easy, flexible way to implement veil skeletons and shimmering effect for Andr
2323
</p>
2424

2525
## Download
26-
[![Download](https://api.bintray.com/packages/devmagician/maven/androidveil/images/download.svg)](https://bintray.com/devmagician/maven/androidveil/_latestVersion)
2726
[![Maven Central](https://img.shields.io/maven-central/v/com.github.skydoves/androidveil.svg?label=Maven%20Central)](https://search.maven.org/search?q=g:%22com.github.skydoves%22%20AND%20a:%22androidveil%22)
2827
[![Jitpack](https://jitpack.io/v/skydoves/AndroidVeil.svg)](https://jitpack.io/#skydoves/AndroidVeil)
2928
### Gradle

androidveil/api/androidveil.api

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
public final class com/skydoves/androidveil/VeilLayout : android/widget/FrameLayout {
2+
public fun <init> (Landroid/content/Context;)V
3+
public fun <init> (Landroid/content/Context;Landroid/util/AttributeSet;)V
4+
public fun <init> (Landroid/content/Context;Landroid/util/AttributeSet;I)V
5+
public fun <init> (Landroid/content/Context;Landroid/util/AttributeSet;II)V
6+
public final fun getDefaultChildVisible ()Z
7+
public final fun getDrawable ()Landroid/graphics/drawable/Drawable;
8+
public final fun getLayout ()I
9+
public final fun getNonShimmer ()Lcom/facebook/shimmer/Shimmer;
10+
public final fun getRadius ()F
11+
public final fun getShimmer ()Lcom/facebook/shimmer/Shimmer;
12+
public final fun getShimmerContainer ()Lcom/facebook/shimmer/ShimmerFrameLayout;
13+
public final fun getShimmerEnable ()Z
14+
public fun invalidate ()V
15+
public final fun isVeiled ()Z
16+
public final fun setDefaultChildVisible (Z)V
17+
public final fun setDrawable (Landroid/graphics/drawable/Drawable;)V
18+
public final fun setLayout (I)V
19+
public final fun setLayout (Landroid/view/View;)V
20+
public final fun setRadius (F)V
21+
public final fun setShimmer (Lcom/facebook/shimmer/Shimmer;)V
22+
public final fun setShimmerEnable (Z)V
23+
public final fun startShimmer ()V
24+
public final fun stopShimmer ()V
25+
public final fun unVeil ()V
26+
public final fun veil ()V
27+
}
28+
29+
public final class com/skydoves/androidveil/VeilLayoutKt {
30+
public static final synthetic fun alphaShimmer (Lkotlin/jvm/functions/Function1;)Lcom/facebook/shimmer/Shimmer;
31+
public static final synthetic fun colorShimmer (Lkotlin/jvm/functions/Function1;)Lcom/facebook/shimmer/Shimmer;
32+
}
33+
34+
public final class com/skydoves/androidveil/VeilRecyclerFrameView : android/widget/RelativeLayout {
35+
public fun <init> (Landroid/content/Context;)V
36+
public fun <init> (Landroid/content/Context;Landroid/util/AttributeSet;)V
37+
public fun <init> (Landroid/content/Context;Landroid/util/AttributeSet;I)V
38+
public final fun addVeiledItems (I)V
39+
public final fun getDefaultChildVisible ()Z
40+
public final fun getRecyclerView ()Landroidx/recyclerview/widget/RecyclerView;
41+
public final fun getShimmer ()Lcom/facebook/shimmer/Shimmer;
42+
public final fun getShimmerEnable ()Z
43+
public final fun getVeiledRecyclerView ()Landroidx/recyclerview/widget/RecyclerView;
44+
public final fun setAdapter (Landroidx/recyclerview/widget/RecyclerView$Adapter;)V
45+
public final fun setAdapter (Landroidx/recyclerview/widget/RecyclerView$Adapter;Landroidx/recyclerview/widget/RecyclerView$LayoutManager;)V
46+
public final fun setDefaultChildVisible (Z)V
47+
public final fun setLayoutManager (Landroidx/recyclerview/widget/RecyclerView$LayoutManager;)V
48+
public final fun setShimmer (Lcom/facebook/shimmer/Shimmer;)V
49+
public final fun setShimmerEnable (Z)V
50+
public final fun setVeilLayout (I)V
51+
public final fun setVeilLayout (II)V
52+
public final fun setVeilLayout (ILcom/skydoves/androidveil/VeiledItemOnClickListener;)V
53+
public final fun setVeilLayout (ILcom/skydoves/androidveil/VeiledItemOnClickListener;I)V
54+
public final fun unVeil ()V
55+
public final fun veil ()V
56+
}
57+
58+
public abstract interface class com/skydoves/androidveil/VeiledItemOnClickListener {
59+
public abstract fun onItemClicked (I)V
60+
}
61+

androidveil/build.gradle

Lines changed: 24 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,36 @@
11
apply plugin: 'com.android.library'
22
apply plugin: 'kotlin-android'
33
apply plugin: 'org.jetbrains.dokka'
4+
apply plugin: 'binary-compatibility-validator'
45
apply from: "$rootDir/dependencies.gradle"
56

67
android {
7-
compileSdkVersion versions.compileSdk
8-
defaultConfig {
9-
minSdkVersion versions.minSdk
10-
targetSdkVersion versions.compileSdk
11-
versionCode versions.versionCode
12-
versionName versions.versionName
13-
}
14-
buildFeatures {
15-
buildConfig false
16-
viewBinding true
17-
}
8+
compileSdkVersion versions.compileSdk
9+
defaultConfig {
10+
minSdkVersion versions.minSdk
11+
targetSdkVersion versions.compileSdk
12+
versionCode versions.versionCode
13+
versionName versions.versionName
14+
}
15+
buildFeatures {
16+
buildConfig false
17+
viewBinding true
18+
}
19+
}
20+
21+
apiValidation {
22+
ignoredPackages += [
23+
"com/skydoves/androidveil/databinding",
24+
]
25+
nonPublicMarkers += [
26+
"kotlin.PublishedApi",
27+
]
1828
}
1929

2030
dependencies {
21-
implementation "androidx.appcompat:appcompat:$versions.androidxAppcompat"
22-
implementation "androidx.recyclerview:recyclerview:$versions.recyclerView"
23-
api "com.facebook.shimmer:shimmer:$versions.shimmer"
31+
implementation "androidx.appcompat:appcompat:$versions.androidxAppcompat"
32+
implementation "androidx.recyclerview:recyclerview:$versions.recyclerView"
33+
api "com.facebook.shimmer:shimmer:$versions.shimmer"
2434
}
2535

2636
apply plugin: "com.vanniktech.maven.publish"

androidveil/src/main/java/com/skydoves/androidveil/ResourceExtension.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ package com.skydoves.androidveil
1919
import android.view.View
2020

2121
/** dp size to px size */
22+
@JvmSynthetic
2223
internal fun Float.dp2px(view: View): Float {
2324
return this * view.resources.displayMetrics.density * 0.5f
2425
}

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,11 @@ internal class VeiledAdapter(
3030
private val veilParamList: MutableList<VeilParams> = mutableListOf()
3131

3232
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): VeiledViewHolder {
33-
val binding = ItemVeiledLayoutAndroidveilSkydovesBinding.inflate(LayoutInflater.from(parent.context), parent, false)
33+
val binding = ItemVeiledLayoutAndroidveilSkydovesBinding.inflate(
34+
LayoutInflater.from(parent.context),
35+
parent,
36+
false
37+
)
3438
return VeiledViewHolder(binding).apply {
3539
binding.root.setOnClickListener {
3640
val position = adapterPosition.takeIf { it != RecyclerView.NO_POSITION }

androidveil/src/main/java/com/skydoves/androidveil/ViewExtension.kt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,19 @@ package com.skydoves.androidveil
1919
import android.view.View
2020

2121
/** Makes visible a view. */
22+
@JvmSynthetic
2223
internal fun View.visible() {
2324
this.visibility = View.VISIBLE
2425
}
2526

2627
/** Makes invisible a view. */
28+
@JvmSynthetic
2729
internal fun View.invisible() {
2830
this.visibility = View.INVISIBLE
2931
}
3032

3133
/** makes visible or invisible a View align the value parameter. */
34+
@JvmSynthetic
3235
internal fun View.visible(visible: Boolean) {
3336
if (visible) {
3437
visible()

app/src/main/AndroidManifest.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@
1515
android:name=".DetailActivity"
1616
android:theme="@style/DetailTheme" />
1717
<activity android:name=".SecondActivity" />
18-
<activity android:name=".MainActivity">
18+
<activity
19+
android:name=".MainActivity"
20+
android:exported="true">
1921
<intent-filter>
2022
<action android:name="android.intent.action.MAIN" />
2123
<category android:name="android.intent.category.LAUNCHER" />

build.gradle

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,27 @@
11
buildscript {
2-
apply from: "$rootDir/dependencies.gradle"
3-
repositories {
4-
google()
5-
mavenCentral()
6-
jcenter()
7-
}
8-
dependencies {
9-
classpath "com.android.tools.build:gradle:$versions.gradleBuildTool"
10-
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$versions.kotlin"
11-
classpath "com.diffplug.spotless:spotless-plugin-gradle:$versions.spotlessGradle"
12-
classpath "com.vanniktech:gradle-maven-publish-plugin:$versions.mavenPublish"
13-
classpath "org.jetbrains.dokka:dokka-gradle-plugin:$versions.dokkaGradle"
14-
}
2+
apply from: "$rootDir/dependencies.gradle"
3+
repositories {
4+
google()
5+
mavenCentral()
6+
}
7+
dependencies {
8+
classpath "com.android.tools.build:gradle:$versions.gradleBuildTool"
9+
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$versions.kotlin"
10+
classpath "com.diffplug.spotless:spotless-plugin-gradle:$versions.spotlessGradle"
11+
classpath "com.vanniktech:gradle-maven-publish-plugin:$versions.mavenPublish"
12+
classpath "org.jetbrains.dokka:dokka-gradle-plugin:$versions.dokkaGradle"
13+
classpath "org.jetbrains.kotlinx:binary-compatibility-validator:$versions.binaryValidator"
14+
}
1515
}
1616

1717
allprojects {
18-
repositories {
19-
google()
20-
mavenCentral()
21-
jcenter()
22-
}
18+
repositories {
19+
google()
20+
mavenCentral()
21+
}
2322
}
2423

2524
tasks.withType(Javadoc) {
26-
excludes = ['**/*.kt']
27-
options.addBooleanOption('Xdoclint:none', true)
25+
excludes = ['**/*.kt']
26+
options.addBooleanOption('Xdoclint:none', true)
2827
}

dependencies.gradle

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
ext.versions = [
22
minSdk : 16,
3-
compileSdk : 30,
3+
compileSdk : 31,
44
versionCode : 12,
55
versionName : '1.1.1',
66

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',
7+
gradleBuildTool : '7.0.2',
8+
spotlessGradle : '5.14.0',
9+
ktlintGradle : '0.41.0',
10+
dokkaGradle : '1.4.32',
11+
binaryValidator : '0.7.1',
12+
mavenPublish : '0.15.1',
1213

13-
kotlin : '1.4.20',
14+
kotlin : '1.4.31',
1415
androidxAppcompat: '1.2.0',
1516
recyclerView : '1.1.0',
1617
shimmer : '0.5.0',

gradle.properties

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,3 @@ POM_LICENCE_DIST=repo
4949
POM_DEVELOPER_ID=skydoves
5050
POM_DEVELOPER_NAME=Jaewoong Eum
5151
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/

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ 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-6.7-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip

0 commit comments

Comments
 (0)