Skip to content

Commit badd22d

Browse files
amirisbackamirisback
committed
Release v2.2.5
1 parent 2e301ce commit badd22d

13 files changed

+79
-54
lines changed

‎.github/workflows/android-ci-generate-apk-aab-clean.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717

1818
steps:
1919
- name: Clean all artifacts
20-
uses: c-hive/gha-remove-artifacts@v1
20+
uses: c-hive/gha-remove-artifacts@v4
2121
with:
2222
age: '60 seconds' # '<number> <unit>', e.g. 5 days, 2 years, 90 seconds, parsed by Moment.js
2323
# Optional inputs

‎.github/workflows/android-ci-generate-apk-aab-download.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
runs-on: ubuntu-latest
1818

1919
steps:
20-
- uses: actions/checkout@v3
20+
- uses: actions/checkout@v4
2121

2222
# Set Current Date As Env Variable
2323
- name: Set current date as env variable
@@ -28,7 +28,7 @@ jobs:
2828
run: echo "repository_name=$(echo '${{ github.repository }}' | awk -F '/' '{print $2}')" >> $GITHUB_ENV
2929

3030
- name: Set Up JDK
31-
uses: actions/setup-java@v3
31+
uses: actions/setup-java@v4
3232
with:
3333
distribution: 'zulu' # See 'Supported distributions' for available options
3434
java-version: '17'

‎.github/workflows/android-ci-generate-apk-aab-upload-2.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
runs-on: ubuntu-latest
3535

3636
steps:
37-
- uses: actions/checkout@v3
37+
- uses: actions/checkout@v4
3838

3939
# Set Current Date As Env Variable
4040
- name: Set current date as env variable
@@ -45,7 +45,7 @@ jobs:
4545
run: echo "repository_name=$(echo '${{ github.repository }}' | awk -F '/' '{print $2}')" >> $GITHUB_ENV
4646

4747
- name: Set Up JDK
48-
uses: actions/setup-java@v3
48+
uses: actions/setup-java@v4
4949
with:
5050
distribution: 'zulu' # See 'Supported distributions' for available options
5151
java-version: '17'
@@ -98,21 +98,21 @@ jobs:
9898
# Upload Artifact Build
9999
# Noted For Output [main_project_module]/build/outputs/apk/debug/
100100
- name: Upload APK Debug - ${{ env.repository_name }}
101-
uses: actions/upload-artifact@v3
101+
uses: actions/upload-artifact@v4
102102
with:
103103
name: ${{ env.date_today }} - ${{ env.playstore_name }} - ${{ env.repository_name }} - APK(s) debug generated
104104
path: ${{ env.main_project_module }}/build/outputs/apk/debug/
105105

106106
# Noted For Output [main_project_module]/build/outputs/apk/release/
107107
- name: Upload APK Release - ${{ env.repository_name }}
108-
uses: actions/upload-artifact@v3
108+
uses: actions/upload-artifact@v4
109109
with:
110110
name: ${{ env.date_today }} - ${{ env.playstore_name }} - ${{ env.repository_name }} - APK(s) release generated
111111
path: ${{ env.main_project_module }}/build/outputs/apk/release/
112112

113113
# Noted For Output [main_project_module]/build/outputs/bundle/release/
114114
- name: Upload AAB (App Bundle) Release - ${{ env.repository_name }}
115-
uses: actions/upload-artifact@v3
115+
uses: actions/upload-artifact@v4
116116
with:
117117
name: ${{ env.date_today }} - ${{ env.playstore_name }} - ${{ env.repository_name }} - App bundle(s) AAB release generated
118118
path: ${{ env.main_project_module }}/build/outputs/bundle/release/

‎.github/workflows/android-ci-generate-apk-aab-upload.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
runs-on: ubuntu-latest
2323

2424
steps:
25-
- uses: actions/checkout@v3
25+
- uses: actions/checkout@v4
2626

2727
# Set Current Date As Env Variable
2828
- name: Set current date as env variable
@@ -33,7 +33,7 @@ jobs:
3333
run: echo "repository_name=$(echo '${{ github.repository }}' | awk -F '/' '{print $2}')" >> $GITHUB_ENV
3434

3535
- name: Set Up JDK
36-
uses: actions/setup-java@v3
36+
uses: actions/setup-java@v4
3737
with:
3838
distribution: 'zulu' # See 'Supported distributions' for available options
3939
java-version: '17'
@@ -66,21 +66,21 @@ jobs:
6666
# Upload Artifact Build
6767
# Noted For Output [main_project_module]/build/outputs/apk/debug/
6868
- name: Upload APK Debug - ${{ env.repository_name }}
69-
uses: actions/upload-artifact@v3
69+
uses: actions/upload-artifact@v4
7070
with:
7171
name: ${{ env.date_today }} - ${{ env.playstore_name }} - ${{ env.repository_name }} - APK(s) debug generated
7272
path: ${{ env.main_project_module }}/build/outputs/apk/debug/
7373

7474
# Noted For Output [main_project_module]/build/outputs/apk/release/
7575
- name: Upload APK Release - ${{ env.repository_name }}
76-
uses: actions/upload-artifact@v3
76+
uses: actions/upload-artifact@v4
7777
with:
7878
name: ${{ env.date_today }} - ${{ env.playstore_name }} - ${{ env.repository_name }} - APK(s) release generated
7979
path: ${{ env.main_project_module }}/build/outputs/apk/release/
8080

8181
# Noted For Output [main_project_module]/build/outputs/bundle/release/
8282
- name: Upload AAB (App Bundle) Release - ${{ env.repository_name }}
83-
uses: actions/upload-artifact@v3
83+
uses: actions/upload-artifact@v4
8484
with:
8585
name: ${{ env.date_today }} - ${{ env.playstore_name }} - ${{ env.repository_name }} - App bundle(s) AAB release generated
8686
path: ${{ env.main_project_module }}/build/outputs/bundle/release/

‎.github/workflows/android-ci-publish-play-store.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ jobs:
2121
runs-on: ubuntu-latest
2222

2323
steps:
24-
- uses: actions/checkout@v1
24+
- uses: actions/checkout@v4
2525

2626
- name: Set Up JDK
27-
uses: actions/setup-java@v3
27+
uses: actions/setup-java@v4
2828
with:
2929
java-version: 17
3030

@@ -41,7 +41,7 @@ jobs:
4141
run: ./gradlew bundleRelease
4242

4343
- name: Sign AAB
44-
uses: r0adkll/sign-android-release@v1
44+
uses: r0adkll/sign-android-release@v4
4545
with:
4646
releaseDirectory: app/build/outputs/bundle/release
4747
signingKeyBase64: ${{ secrets.SIGN_KEY }}
@@ -50,7 +50,7 @@ jobs:
5050
keyPassword: ${{ secrets.KEY_PASSWORD }}
5151

5252
- name: Deploy to Play Store
53-
uses: r0adkll/upload-google-play@v1
53+
uses: r0adkll/upload-google-play@v4
5454
with:
5555
serviceAccountJsonPlainText: ${{secrets.SERVICE_ACCOUNT}}
5656
packageName: com.tomerpacific.laundry

‎.github/workflows/android-ci.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
runs-on: ubuntu-latest
2424

2525
steps:
26-
- uses: actions/checkout@v3
26+
- uses: actions/checkout@v4
2727

2828
# Set Current Date As Env Variable
2929
- name: Set current date as env variable
@@ -34,7 +34,7 @@ jobs:
3434
run: echo "repository_name=$(echo '${{ github.repository }}' | awk -F '/' '{print $2}')" >> $GITHUB_ENV
3535

3636
- name: Set Up JDK
37-
uses: actions/setup-java@v3
37+
uses: actions/setup-java@v4
3838
with:
3939
distribution: 'zulu' # See 'Supported distributions' for available options
4040
java-version: '17'

‎README.md

+14-12
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,11 @@
2828
## Version Release
2929
This Is Latest Release
3030

31-
$version_release = 2.2.4
31+
$version_release = 2.2.5
3232

3333
What's New??
3434

35+
* Update Target SDK 35 *
3536
* Update Action Script *
3637
* Update Android Studio Latest Version *
3738
* Update Gradle Latest Version *
@@ -41,6 +42,7 @@ What's New??
4142
* Update Android SDK Tools *
4243
* Add Bundletool.jar for workflow github action *
4344
* Add .run configuration *
45+
* Update To Libs.Version.Toml
4446

4547
## Article Sources
4648
- [How To Securely Build and Sign Your Android App With GitHub Actions](https://proandroiddev.com/how-to-securely-build-and-sign-your-android-app-with-github-actions-ad5323452ce)
@@ -89,7 +91,7 @@ jobs:
8991
runs-on: ubuntu-latest
9092

9193
steps:
92-
- uses: actions/checkout@v3
94+
- uses: actions/checkout@v4
9395

9496
# Set Current Date As Env Variable
9597
- name: Set current date as env variable
@@ -100,7 +102,7 @@ jobs:
100102
run: echo "repository_name=$(echo '${{ github.repository }}' | awk -F '/' '{print $2}')" >> $GITHUB_ENV
101103

102104
- name: Set Up JDK
103-
uses: actions/setup-java@v3
105+
uses: actions/setup-java@v4
104106
with:
105107
distribution: 'zulu' # See 'Supported distributions' for available options
106108
java-version: '17'
@@ -133,21 +135,21 @@ jobs:
133135
# Upload Artifact Build
134136
# Noted For Output [main_project_module]/build/outputs/apk/debug/
135137
- name: Upload APK Debug - ${{ env.repository_name }}
136-
uses: actions/upload-artifact@v3
138+
uses: actions/upload-artifact@v4
137139
with:
138140
name: ${{ env.date_today }} - ${{ env.playstore_name }} - ${{ env.repository_name }} - APK(s) debug generated
139141
path: ${{ env.main_project_module }}/build/outputs/apk/debug/
140142

141143
# Noted For Output [main_project_module]/build/outputs/apk/release/
142144
- name: Upload APK Release - ${{ env.repository_name }}
143-
uses: actions/upload-artifact@v3
145+
uses: actions/upload-artifact@v4
144146
with:
145147
name: ${{ env.date_today }} - ${{ env.playstore_name }} - ${{ env.repository_name }} - APK(s) release generated
146148
path: ${{ env.main_project_module }}/build/outputs/apk/release/
147149

148150
# Noted For Output [main_project_module]/build/outputs/bundle/release/
149151
- name: Upload AAB (App Bundle) Release - ${{ env.repository_name }}
150-
uses: actions/upload-artifact@v3
152+
uses: actions/upload-artifact@v4
151153
with:
152154
name: ${{ env.date_today }} - ${{ env.playstore_name }} - ${{ env.repository_name }} - App bundle(s) AAB release generated
153155
path: ${{ env.main_project_module }}/build/outputs/bundle/release/
@@ -192,7 +194,7 @@ jobs:
192194

193195
steps:
194196
- name: Clean all artifacts
195-
uses: c-hive/gha-remove-artifacts@v1
197+
uses: c-hive/gha-remove-artifacts@v4
196198
with:
197199
age: '60 seconds' # '<number> <unit>', e.g. 5 days, 2 years, 90 seconds, parsed by Moment.js
198200
# Optional inputs
@@ -244,7 +246,7 @@ jobs:
244246
runs-on: ubuntu-latest
245247

246248
steps:
247-
- uses: actions/checkout@v3
249+
- uses: actions/checkout@v4
248250

249251
# Set Current Date As Env Variable
250252
- name: Set current date as env variable
@@ -255,7 +257,7 @@ jobs:
255257
run: echo "repository_name=$(echo '${{ github.repository }}' | awk -F '/' '{print $2}')" >> $GITHUB_ENV
256258

257259
- name: Set Up JDK
258-
uses: actions/setup-java@v3
260+
uses: actions/setup-java@v4
259261
with:
260262
distribution: 'zulu' # See 'Supported distributions' for available options
261263
java-version: '17'
@@ -308,21 +310,21 @@ jobs:
308310
# Upload Artifact Build
309311
# Noted For Output [main_project_module]/build/outputs/apk/debug/
310312
- name: Upload APK Debug - ${{ env.repository_name }}
311-
uses: actions/upload-artifact@v3
313+
uses: actions/upload-artifact@v4
312314
with:
313315
name: ${{ env.date_today }} - ${{ env.playstore_name }} - ${{ env.repository_name }} - APK(s) debug generated
314316
path: ${{ env.main_project_module }}/build/outputs/apk/debug/
315317

316318
# Noted For Output [main_project_module]/build/outputs/apk/release/
317319
- name: Upload APK Release - ${{ env.repository_name }}
318-
uses: actions/upload-artifact@v3
320+
uses: actions/upload-artifact@v4
319321
with:
320322
name: ${{ env.date_today }} - ${{ env.playstore_name }} - ${{ env.repository_name }} - APK(s) release generated
321323
path: ${{ env.main_project_module }}/build/outputs/apk/release/
322324

323325
# Noted For Output [main_project_module]/build/outputs/bundle/release/
324326
- name: Upload AAB (App Bundle) Release - ${{ env.repository_name }}
325-
uses: actions/upload-artifact@v3
327+
uses: actions/upload-artifact@v4
326328
with:
327329
name: ${{ env.date_today }} - ${{ env.playstore_name }} - ${{ env.repository_name }} - App bundle(s) AAB release generated
328330
path: ${{ env.main_project_module }}/build/outputs/bundle/release/

‎app/build.gradle.kts

+11-12
Original file line numberDiff line numberDiff line change
@@ -67,22 +67,21 @@ android {
6767
targetCompatibility = JavaVersion.VERSION_17
6868
}
6969

70-
tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
71-
kotlinOptions {
72-
jvmTarget = "17"
73-
}
70+
kotlinOptions {
71+
jvmTarget = "17"
7472
}
73+
7574
}
7675

7776
dependencies {
7877

79-
implementation("androidx.core:core-ktx:1.12.0")
80-
implementation("androidx.appcompat:appcompat:1.6.1")
81-
implementation("androidx.constraintlayout:constraintlayout:2.1.4")
82-
implementation("androidx.work:work-runtime-ktx:2.9.0")
83-
implementation("com.google.android.material:material:1.11.0")
78+
implementation(libs.androidx.core.ktx)
79+
implementation(libs.androidx.appcompat)
80+
implementation(libs.androidx.constraintlayout)
81+
implementation(libs.androidx.work.runtime.ktx)
82+
implementation(libs.material)
8483

85-
testImplementation("junit:junit:4.13.2")
86-
androidTestImplementation("androidx.test.ext:junit:1.1.5")
87-
androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
84+
testImplementation(libs.junit)
85+
androidTestImplementation(libs.androidx.junit)
86+
androidTestImplementation(libs.androidx.espresso.core)
8887
}

‎build.gradle.kts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22
plugins {
3-
id("com.android.application") version "8.3.1" apply false
4-
id("com.android.library") version "8.3.1" apply false
5-
id("org.jetbrains.kotlin.android") version Dependency.KOTLIN_VERSION apply false
3+
alias(libs.plugins.android.application) apply false
4+
alias(libs.plugins.android.library) apply false
5+
alias(libs.plugins.kotlin.android) apply false
66
}
77

88
tasks.register("clean", Delete::class) {

‎buildSrc/src/main/kotlin/Dependency.kt

-5
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,4 @@
1313

1414
object Dependency {
1515

16-
// dependencies version
17-
const val KOTLIN_VERSION = "1.9.22"
18-
const val COMPOSE_VERSION = "1.0.5"
19-
const val KOIN_VERSION = "3.1.4"
20-
2116
}

‎buildSrc/src/main/kotlin/ProjectSetting.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ object ProjectSetting {
2424

2525
const val VERSION_MAJOR = 2
2626
const val VERSION_MINOR = 2
27-
const val VERSION_PATCH = 4
27+
const val VERSION_PATCH = 5
2828

2929
const val PROJECT_MIN_SDK = 24
30-
const val PROJECT_COMPILE_SDK = 34
30+
const val PROJECT_COMPILE_SDK = 35
3131

3232
// Setup Publish Setting
3333
const val KEY_PATH = "frogoboxdev.jks"

‎gradle/libs.versions.toml

+29
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
[versions]
2+
agp = "8.7.2"
3+
kotlin = "1.9.24"
4+
coreKtx = "1.15.0"
5+
junit = "4.13.2"
6+
junitVersion = "1.2.1"
7+
espressoCore = "3.6.1"
8+
appcompat = "1.7.0"
9+
material = "1.12.0"
10+
activity = "1.9.3"
11+
constraintlayout = "2.2.0"
12+
workRuntimeKtx = "2.10.0"
13+
14+
[libraries]
15+
androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
16+
androidx-work-runtime-ktx = { module = "androidx.work:work-runtime-ktx", version.ref = "workRuntimeKtx" }
17+
junit = { group = "junit", name = "junit", version.ref = "junit" }
18+
androidx-junit = { group = "androidx.test.ext", name = "junit", version.ref = "junitVersion" }
19+
androidx-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espressoCore" }
20+
androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" }
21+
material = { group = "com.google.android.material", name = "material", version.ref = "material" }
22+
androidx-activity = { group = "androidx.activity", name = "activity", version.ref = "activity" }
23+
androidx-constraintlayout = { group = "androidx.constraintlayout", name = "constraintlayout", version.ref = "constraintlayout" }
24+
25+
[plugins]
26+
android-application = { id = "com.android.application", version.ref = "agp" }
27+
android-library = { id = "com.android.library", version.ref = "agp" }
28+
kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
29+

‎gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#Fri Feb 11 12:32:43 WIB 2022
22
distributionBase=GRADLE_USER_HOME
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
44
distributionPath=wrapper/dists
55
zipStorePath=wrapper/dists
66
zipStoreBase=GRADLE_USER_HOME

0 commit comments

Comments
 (0)