From 49c5b88f3d0606ac13fc1378529a0125365b2ddd Mon Sep 17 00:00:00 2001 From: skydoves Date: Wed, 7 Jul 2021 00:13:09 +0900 Subject: [PATCH 1/2] Bump gradle dependencies --- app/build.gradle | 4 ++++ build.gradle | 2 -- dependencies.gradle | 16 ++++++++-------- gradle.properties | 3 --- powerspinner/build.gradle | 7 +++++-- .../com/skydoves/powerspinner/WhatIfExtension.kt | 1 - 6 files changed, 17 insertions(+), 16 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 8e29e8f..ae2a85a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -14,6 +14,10 @@ android { buildFeatures { viewBinding true } + compileOptions { + sourceCompatibility 1.8 + targetCompatibility 1.8 + } } dependencies { diff --git a/build.gradle b/build.gradle index 388f27a..5e96d16 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,6 @@ buildscript { repositories { google() mavenCentral() - jcenter() } dependencies { classpath "com.android.tools.build:gradle:$versions.gradleBuildTool" @@ -18,7 +17,6 @@ allprojects { repositories { google() mavenCentral() - jcenter() } } diff --git a/dependencies.gradle b/dependencies.gradle index 70a6e1d..0695937 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,21 +1,21 @@ ext.versions = [ minSdk : 17, compileSdk : 30, - versionCode : 18, - versionName : '1.1.7', + versionCode : 19, + versionName : '1.1.8', gradleBuildTool : '4.1.3', - spotlessGradle : '5.12.1', + spotlessGradle : '5.13.0', ktlintGradle : '0.41.0', dokkaGradle : '1.4.30', - mavenPublish : '0.13.0', + mavenPublish : '0.15.1', kotlin : '1.4.31', - androidxAppcompat: '1.2.0', - lifecycle : '2.2.0', - recyclerView : '1.2.0', + androidxAppcompat: '1.3.0', + lifecycle : '2.3.1', + recyclerView : '1.2.1', preference : '1.1.1', // for demo - googleMaterial : '1.4.0-alpha02' + googleMaterial : '1.4.0' ] diff --git a/gradle.properties b/gradle.properties index e678c0d..22aface 100644 --- a/gradle.properties +++ b/gradle.properties @@ -49,6 +49,3 @@ POM_LICENCE_DIST=repo POM_DEVELOPER_ID=skydoves POM_DEVELOPER_NAME=Jaewoong Eum POM_DEVELOPER_URL=https://github.com/skydoves/ - -RELEASE_REPOSITORY_URL=https://oss.sonatype.org/service/local/staging/deploy/maven2/ -SNAPSHOT_REPOSITORY_URL=https://oss.sonatype.org/content/repositories/snapshots/ diff --git a/powerspinner/build.gradle b/powerspinner/build.gradle index 5ce925f..091ac48 100644 --- a/powerspinner/build.gradle +++ b/powerspinner/build.gradle @@ -1,6 +1,5 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' -apply plugin: 'kotlin-kapt' apply plugin: 'org.jetbrains.dokka' apply from: "$rootDir/dependencies.gradle" @@ -16,13 +15,17 @@ android { viewBinding true buildConfig false } + compileOptions { + sourceCompatibility 1.8 + targetCompatibility 1.8 + } } dependencies { implementation "androidx.appcompat:appcompat:$versions.androidxAppcompat" implementation "androidx.recyclerview:recyclerview:$versions.recyclerView" implementation "androidx.preference:preference-ktx:$versions.preference" - kapt "androidx.lifecycle:lifecycle-compiler:$versions.lifecycle" + implementation "androidx.lifecycle:lifecycle-common-java8:$versions.lifecycle" } kotlin { diff --git a/powerspinner/src/main/java/com/skydoves/powerspinner/WhatIfExtension.kt b/powerspinner/src/main/java/com/skydoves/powerspinner/WhatIfExtension.kt index 45ec939..6b6af05 100644 --- a/powerspinner/src/main/java/com/skydoves/powerspinner/WhatIfExtension.kt +++ b/powerspinner/src/main/java/com/skydoves/powerspinner/WhatIfExtension.kt @@ -17,7 +17,6 @@ package com.skydoves.powerspinner /** - * * ☔ WhatIf is kotlin extensions for expressing a single if-else statement, nullable and boolean. * * [WhatIf](https://github.com/skydoves/WhatIf) From 219b2389f2a65db778619ceace8208b22d0f8a25 Mon Sep 17 00:00:00 2001 From: skydoves Date: Wed, 7 Jul 2021 00:21:59 +0900 Subject: [PATCH 2/2] Release a new stable 1.1.8 --- README.md | 2 +- dependencies.gradle | 2 +- gradle.properties | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 61d7acf..97ae3f9 100644 --- a/README.md +++ b/README.md @@ -37,7 +37,7 @@ allprojects { And add a dependency code to your **module**'s `build.gradle` file. ```gradle dependencies { - implementation "com.github.skydoves:powerspinner:1.1.7" + implementation "com.github.skydoves:powerspinner:1.1.8" } ``` ## SNAPSHOT diff --git a/dependencies.gradle b/dependencies.gradle index 0695937..6644eca 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -7,7 +7,7 @@ ext.versions = [ gradleBuildTool : '4.1.3', spotlessGradle : '5.13.0', ktlintGradle : '0.41.0', - dokkaGradle : '1.4.30', + dokkaGradle : '1.4.32', mavenPublish : '0.15.1', kotlin : '1.4.31', diff --git a/gradle.properties b/gradle.properties index 22aface..4c50bac 100644 --- a/gradle.properties +++ b/gradle.properties @@ -31,7 +31,7 @@ systemProp.org.gradle.internal.http.socketTimeout=120000 GROUP=com.github.skydoves POM_PACKAGING=aar -VERSION_NAME=1.1.8-SNAPSHOT +VERSION_NAME=1.1.9-SNAPSHOT POM_ARTIFACT_ID=powerspinner POM_NAME=powerspinner diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 2eb8f84..f582ef9 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip