Skip to content

Commit d367f05

Browse files
mehrab385mehrab385
authored
Update versions (#192)
* feat: update versions * Add caching * update version * . * .
1 parent db5391a commit d367f05

File tree

10 files changed

+120
-128
lines changed

10 files changed

+120
-128
lines changed

‎.github/workflows/assemble.yml

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

1616
steps:
1717
- uses: actions/checkout@v3
18-
- name: Set up JDK 11
18+
- name: Set up JDK 17
1919
uses: actions/setup-java@v3
2020
with:
2121
distribution: 'adopt'
22-
java-version: '11'
22+
java-version: '17'
2323
- name: Grant execute permission for gradlew
2424
run: chmod +x gradlew
2525
- name: Build with Gradle

‎.github/workflows/publish.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ jobs:
1111
steps:
1212
- name: Check out code
1313
uses: actions/[email protected]
14-
- name: Set up JDK 11
14+
- name: Set up JDK 17
1515
uses: actions/[email protected]
1616
with:
1717
distribution: adopt
18-
java-version: 11
18+
java-version: 17
1919
- name: Release build
2020
run: ./gradlew assembleRelease --scan
2121
- name: Publish to MavenCentral
@@ -26,4 +26,4 @@ jobs:
2626
SIGNING_KEY_ID: ${{ secrets.SIGNING_KEY_ID }}
2727
SIGNING_PASSWORD: ${{ secrets.SIGNING_PASSWORD }}
2828
SIGNING_KEY: ${{ secrets.SIGNING_KEY }}
29-
SONATYPE_STAGING_PROFILE_ID: ${{ secrets.SONATYPE_STAGING_PROFILE_ID }}
29+
SONATYPE_STAGING_PROFILE_ID: ${{ secrets.SONATYPE_STAGING_PROFILE_ID }}

‎README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,10 @@ Add the button in your layout file and customize it the way you like it.
4242
android:id="@+id/btn_id"
4343
android:layout_width="match_parent"
4444
android:layout_height="wrap_content"
45-
android:background="@drawable/circular_border_shape" />
45+
android:background="@drawable/circular_border_shape"
4646
app:spinning_bar_width="4dp" <!-- Optional -->
4747
app:spinning_bar_color="#FFF" <!-- Optional -->
48-
app:spinning_bar_padding="6dp" <!-- Optional -->
48+
app:spinning_bar_padding="6dp" /> <!-- Optional -->
4949
```
5050

5151
Then, instanciate the button

‎build.gradle

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
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.8.21'
4+
ext.kotlin_version = '1.9.23'
55
repositories {
66
maven { url "https://plugins.gradle.org/m2/" }
77
google()
88
mavenLocal()
99
mavenCentral()
1010
}
1111
dependencies {
12-
classpath 'com.android.tools.build:gradle:7.4.2'
12+
classpath 'com.android.tools.build:gradle:8.3.1'
1313
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
14-
classpath 'org.jmailen.gradle:kotlinter-gradle:1.20.1'
15-
classpath 'io.github.gradle-nexus:publish-plugin:1.3.0'
16-
classpath("org.jetbrains.dokka:dokka-gradle-plugin:1.8.10")
14+
classpath 'org.jmailen.gradle:kotlinter-gradle:4.3.0'
15+
classpath 'io.github.gradle-nexus:publish-plugin:2.0.0-rc-2'
16+
classpath("org.jetbrains.dokka:dokka-gradle-plugin:1.9.20")
1717
// NOTE: Do not place your application dependencies here; they belong
1818
// in the individual module build.gradle files
1919
}
@@ -29,12 +29,4 @@ allprojects {
2929
mavenLocal()
3030
mavenCentral()
3131
}
32-
33-
subprojects {
34-
tasks.withType(Javadoc).all { enabled = false }
35-
}
36-
}
37-
38-
task clean(type: Delete) {
39-
delete rootProject.buildDir
4032
}

‎gradle.properties

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,15 @@
1111
# The setting is particularly useful for tweaking memory settings.
1212
# Default value: -Xmx10248m -XX:MaxPermSize=256m
1313
# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
14-
org.gradle.jvmargs=-Xmx2048m
14+
org.gradle.jvmargs=-Xmx1024M -Dkotlin.daemon.jvm.options\="-Xmx1024M" -XX\:+UseParallelGC -XX\:MaxMetaspaceSize\=512m -XX\:+HeapDumpOnOutOfMemoryError -Dfile.encoding\=UTF-8
1515
android.enableJetifier=true
1616
android.useAndroidX=true
1717
android.defaults.buildfeatures.buildconfig=true
1818
android.nonTransitiveRClass=false
1919
android.nonFinalResIds=false
20+
kotlin.code.style=official
21+
kotlin.incremental=true
22+
org.gradle.caching=true
2023

2124
# When configured, Gradle will run in incubating parallel mode.
2225
# This option should only be used with decoupled projects. More details, visit

‎gradle/wrapper/gradle-wrapper.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Fri May 19 14:11:12 CEST 2023
1+
#Wed Mar 06 10:41:53 EST 2024
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
55
zipStoreBase=GRADLE_USER_HOME
66
zipStorePath=wrapper/dists

‎gradlew.bat

Lines changed: 90 additions & 90 deletions
Original file line numberDiff line numberDiff line change
@@ -1,90 +1,90 @@
1-
@if "%DEBUG%" == "" @echo off
2-
@rem ##########################################################################
3-
@rem
4-
@rem Gradle startup script for Windows
5-
@rem
6-
@rem ##########################################################################
7-
8-
@rem Set local scope for the variables with windows NT shell
9-
if "%OS%"=="Windows_NT" setlocal
10-
11-
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
12-
set DEFAULT_JVM_OPTS=
13-
14-
set DIRNAME=%~dp0
15-
if "%DIRNAME%" == "" set DIRNAME=.
16-
set APP_BASE_NAME=%~n0
17-
set APP_HOME=%DIRNAME%
18-
19-
@rem Find java.exe
20-
if defined JAVA_HOME goto findJavaFromJavaHome
21-
22-
set JAVA_EXE=java.exe
23-
%JAVA_EXE% -version >NUL 2>&1
24-
if "%ERRORLEVEL%" == "0" goto init
25-
26-
echo.
27-
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
28-
echo.
29-
echo Please set the JAVA_HOME variable in your environment to match the
30-
echo location of your Java installation.
31-
32-
goto fail
33-
34-
:findJavaFromJavaHome
35-
set JAVA_HOME=%JAVA_HOME:"=%
36-
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
37-
38-
if exist "%JAVA_EXE%" goto init
39-
40-
echo.
41-
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
42-
echo.
43-
echo Please set the JAVA_HOME variable in your environment to match the
44-
echo location of your Java installation.
45-
46-
goto fail
47-
48-
:init
49-
@rem Get command-line arguments, handling Windowz variants
50-
51-
if not "%OS%" == "Windows_NT" goto win9xME_args
52-
if "%@eval[2+2]" == "4" goto 4NT_args
53-
54-
:win9xME_args
55-
@rem Slurp the command line arguments.
56-
set CMD_LINE_ARGS=
57-
set _SKIP=2
58-
59-
:win9xME_args_slurp
60-
if "x%~1" == "x" goto execute
61-
62-
set CMD_LINE_ARGS=%*
63-
goto execute
64-
65-
:4NT_args
66-
@rem Get arguments from the 4NT Shell from JP Software
67-
set CMD_LINE_ARGS=%$
68-
69-
:execute
70-
@rem Setup the command line
71-
72-
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
73-
74-
@rem Execute Gradle
75-
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
76-
77-
:end
78-
@rem End local scope for the variables with windows NT shell
79-
if "%ERRORLEVEL%"=="0" goto mainEnd
80-
81-
:fail
82-
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
83-
rem the _cmd.exe /c_ return code!
84-
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
85-
exit /b 1
86-
87-
:mainEnd
88-
if "%OS%"=="Windows_NT" endlocal
89-
90-
:omega
1+
@if "%DEBUG%" == "" @echo off
2+
@rem ##########################################################################
3+
@rem
4+
@rem Gradle startup script for Windows
5+
@rem
6+
@rem ##########################################################################
7+
8+
@rem Set local scope for the variables with windows NT shell
9+
if "%OS%"=="Windows_NT" setlocal
10+
11+
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
12+
set DEFAULT_JVM_OPTS=
13+
14+
set DIRNAME=%~dp0
15+
if "%DIRNAME%" == "" set DIRNAME=.
16+
set APP_BASE_NAME=%~n0
17+
set APP_HOME=%DIRNAME%
18+
19+
@rem Find java.exe
20+
if defined JAVA_HOME goto findJavaFromJavaHome
21+
22+
set JAVA_EXE=java.exe
23+
%JAVA_EXE% -version >NUL 2>&1
24+
if "%ERRORLEVEL%" == "0" goto init
25+
26+
echo.
27+
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
28+
echo.
29+
echo Please set the JAVA_HOME variable in your environment to match the
30+
echo location of your Java installation.
31+
32+
goto fail
33+
34+
:findJavaFromJavaHome
35+
set JAVA_HOME=%JAVA_HOME:"=%
36+
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
37+
38+
if exist "%JAVA_EXE%" goto init
39+
40+
echo.
41+
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
42+
echo.
43+
echo Please set the JAVA_HOME variable in your environment to match the
44+
echo location of your Java installation.
45+
46+
goto fail
47+
48+
:init
49+
@rem Get command-line arguments, handling Windowz variants
50+
51+
if not "%OS%" == "Windows_NT" goto win9xME_args
52+
if "%@eval[2+2]" == "4" goto 4NT_args
53+
54+
:win9xME_args
55+
@rem Slurp the command line arguments.
56+
set CMD_LINE_ARGS=
57+
set _SKIP=2
58+
59+
:win9xME_args_slurp
60+
if "x%~1" == "x" goto execute
61+
62+
set CMD_LINE_ARGS=%*
63+
goto execute
64+
65+
:4NT_args
66+
@rem Get arguments from the 4NT Shell from JP Software
67+
set CMD_LINE_ARGS=%$
68+
69+
:execute
70+
@rem Setup the command line
71+
72+
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
73+
74+
@rem Execute Gradle
75+
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
76+
77+
:end
78+
@rem End local scope for the variables with windows NT shell
79+
if "%ERRORLEVEL%"=="0" goto mainEnd
80+
81+
:fail
82+
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
83+
rem the _cmd.exe /c_ return code!
84+
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
85+
exit /b 1
86+
87+
:mainEnd
88+
if "%OS%"=="Windows_NT" endlocal
89+
90+
:omega

‎loading-button-android/build.gradle.kts

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
import org.jetbrains.kotlin.konan.properties.Properties
2-
import java.io.FileInputStream
3-
41
plugins {
52
id("com.android.library")
63
kotlin("android")
@@ -10,7 +7,7 @@ apply(from = "${rootDir}/scripts/publish-module.gradle")
107

118
android {
129
namespace = "com.github.leandroborgesferreira.loadingbutton"
13-
compileSdk = 33
10+
compileSdk = 34
1411

1512
defaultConfig {
1613
minSdk = 21
@@ -38,7 +35,7 @@ android {
3835
}
3936

4037
dependencies {
41-
implementation("androidx.core:core-ktx:1.10.1")
38+
implementation("androidx.core:core-ktx:1.12.0")
4239
implementation("androidx.appcompat:appcompat:1.6.1")
4340

4441
testImplementation("org.mockito:mockito-core:5.3.1")

‎sample/build.gradle.kts

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ plugins {
55

66
android {
77
namespace = "com.github.leandroborgesferreira.sample"
8-
compileSdk = 33
8+
compileSdk = 34
99

1010
defaultConfig {
1111
applicationId = "com.github.leandroborgesferreira.sample"
1212
minSdk = 21
13-
targetSdk = 33
13+
targetSdk = 34
1414
versionCode = 1
1515
versionName = "1.0"
1616

@@ -40,7 +40,7 @@ android {
4040
compose = true
4141
}
4242
composeOptions {
43-
kotlinCompilerExtensionVersion = "1.4.7"
43+
kotlinCompilerExtensionVersion = "1.5.11"
4444
}
4545
packagingOptions {
4646
resources {
@@ -52,21 +52,21 @@ android {
5252
dependencies {
5353
implementation(project(":loading-button-android"))
5454

55-
implementation("androidx.core:core-ktx:1.10.1")
56-
implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.6.1")
57-
implementation("androidx.activity:activity-compose:1.7.1")
58-
implementation(platform("androidx.compose:compose-bom:2023.03.00"))
55+
implementation("androidx.core:core-ktx:1.12.0")
56+
implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.7.0")
57+
implementation("androidx.activity:activity-compose:1.8.2")
58+
implementation(platform("androidx.compose:compose-bom:2024.03.00"))
5959
implementation("androidx.compose.ui:ui")
6060
implementation("androidx.compose.ui:ui-graphics")
6161
implementation("androidx.compose.ui:ui-tooling-preview")
6262
implementation("androidx.compose.material3:material3")
6363
implementation("androidx.appcompat:appcompat:1.6.1")
64-
implementation("com.google.android.material:material:1.9.0")
64+
implementation("com.google.android.material:material:1.11.0")
6565
implementation("androidx.constraintlayout:constraintlayout:2.1.4")
6666
testImplementation("junit:junit:4.13.2")
6767
androidTestImplementation("androidx.test.ext:junit:1.1.5")
6868
androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
69-
androidTestImplementation(platform("androidx.compose:compose-bom:2023.03.00"))
69+
androidTestImplementation(platform("androidx.compose:compose-bom:2024.03.00"))
7070
androidTestImplementation("androidx.compose.ui:ui-test-junit4")
7171
debugImplementation("androidx.compose.ui:ui-tooling")
7272
debugImplementation("androidx.compose.ui:ui-test-manifest")

‎scripts/publish-module.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ afterEvaluate {
3131
release(MavenPublication) {
3232
groupId "com.github.leandroborgesferreira"
3333
artifactId "loading-button-android"
34-
version "2.3.0"
34+
version "2.4.0"
3535

3636
from components.release
3737

0 commit comments

Comments
 (0)