Skip to content

Commit 544cbea

Browse files
committed
Merge remote-tracking branch 'origin/develop'
2 parents 5e19bbd + dc51682 commit 544cbea

File tree

12 files changed

+22
-21
lines changed

12 files changed

+22
-21
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ jobs:
6161
steps:
6262

6363
- name: Setup Gradle Repo
64-
uses: Oztechan/Global/actions/setup-gradle-repo@f2926167f4c8103dca1abd9cf2908c83733e1898
64+
uses: Oztechan/Global/actions/setup-gradle-repo@873e06320ffabbaa07f705b7ea059c248a070f88
6565

6666
- name: Adding secret files
6767
uses: ./.github/actions/add-secret-files

.github/workflows/main.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ jobs:
7070
steps:
7171

7272
- name: Setup Gradle Repo
73-
uses: Oztechan/Global/actions/setup-gradle-repo@f2926167f4c8103dca1abd9cf2908c83733e1898
73+
uses: Oztechan/Global/actions/setup-gradle-repo@873e06320ffabbaa07f705b7ea059c248a070f88
7474

7575
- name: Adding secret files
7676
uses: ./.github/actions/add-secret-files
@@ -153,7 +153,7 @@ jobs:
153153
steps:
154154

155155
- name: Setup Gradle Repo
156-
uses: Oztechan/Global/actions/setup-gradle-repo@f2926167f4c8103dca1abd9cf2908c83733e1898
156+
uses: Oztechan/Global/actions/setup-gradle-repo@873e06320ffabbaa07f705b7ea059c248a070f88
157157

158158
- name: Adding secret files
159159
uses: ./.github/actions/add-secret-files
@@ -237,7 +237,7 @@ jobs:
237237
steps:
238238

239239
- name: Setup Gradle Repo
240-
uses: Oztechan/Global/actions/setup-gradle-repo@f2926167f4c8103dca1abd9cf2908c83733e1898
240+
uses: Oztechan/Global/actions/setup-gradle-repo@873e06320ffabbaa07f705b7ea059c248a070f88
241241

242242
- name: Test
243243
run: ./gradlew test
@@ -257,7 +257,7 @@ jobs:
257257
steps:
258258

259259
- name: Setup Gradle Repo
260-
uses: Oztechan/Global/actions/setup-gradle-repo@f2926167f4c8103dca1abd9cf2908c83733e1898
260+
uses: Oztechan/Global/actions/setup-gradle-repo@873e06320ffabbaa07f705b7ea059c248a070f88
261261

262262
- name: Generate Coverage
263263
run: ./gradlew koverXmlReport
@@ -300,7 +300,7 @@ jobs:
300300
steps:
301301

302302
- name: Setup Gradle Repo
303-
uses: Oztechan/Global/actions/setup-gradle-repo@f2926167f4c8103dca1abd9cf2908c83733e1898
303+
uses: Oztechan/Global/actions/setup-gradle-repo@873e06320ffabbaa07f705b7ea059c248a070f88
304304

305305
- name: Detekt & Lint
306306
run: ./gradlew detektAll lint

.github/workflows/project.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ on:
1414

1515
jobs:
1616
ProjectAutomations:
17-
uses: Oztechan/Global/.github/workflows/reusable-project.yml@f2926167f4c8103dca1abd9cf2908c83733e1898
17+
uses: Oztechan/Global/.github/workflows/reusable-project.yml@873e06320ffabbaa07f705b7ea059c248a070f88
1818
with:
1919
project_id: 2
2020
secrets: inherit

.github/workflows/publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
jobs:
99

1010
PublishRelease:
11-
uses: Oztechan/Global/.github/workflows/reusable-publish.yml@f2926167f4c8103dca1abd9cf2908c83733e1898
11+
uses: Oztechan/Global/.github/workflows/reusable-publish.yml@873e06320ffabbaa07f705b7ea059c248a070f88
1212
with:
1313
slack_channel: "ccc-github"
1414
secrets: inherit

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ jobs:
6161
steps:
6262

6363
- name: Setup Gradle Repo
64-
uses: Oztechan/Global/actions/setup-gradle-repo@f2926167f4c8103dca1abd9cf2908c83733e1898
64+
uses: Oztechan/Global/actions/setup-gradle-repo@873e06320ffabbaa07f705b7ea059c248a070f88
6565

6666
- name: Adding secret files
6767
uses: ./.github/actions/add-secret-files
@@ -215,7 +215,7 @@ jobs:
215215
status: ${{ steps.status.outputs.status }}
216216
steps:
217217
- name: Setup Gradle Repo
218-
uses: Oztechan/Global/actions/setup-gradle-repo@f2926167f4c8103dca1abd9cf2908c83733e1898
218+
uses: Oztechan/Global/actions/setup-gradle-repo@873e06320ffabbaa07f705b7ea059c248a070f88
219219

220220
- name: Adding secret files
221221
uses: ./.github/actions/add-secret-files

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
android.useAndroidX=true
33
android.enableJetifier=true
44
# Gradle
5-
org.gradle.jvmargs=-Xmx8g -XX:MaxMetaspaceSize=2g -XX:+HeapDumpOnOutOfMemoryError -XX:+UseParallelGC -Dfile.encoding=UTF-8 -Dkotlin.daemon.jvm.options\="-Xmx8g"
5+
org.gradle.jvmargs=-Xmx4g -Dkotlin.daemon.jvm.options=-Xmx2G -XX:MaxMetaspaceSize=2g -XX:+HeapDumpOnOutOfMemoryError -XX:+UseParallelGC -Dfile.encoding=UTF-8
66
org.gradle.parallel=true
77
org.gradle.caching=true
88
org.gradle.daemon=true

gradle/libs.versions.toml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
[versions]
22

33
kotlin = "2.0.20"
4-
androidGradlePlugin = "8.6.0"
4+
androidGradlePlugin = "8.6.1"
55
jetbrainsCompose = "1.6.11"
66
glance = "1.1.0"
77
mokkery = "2.3.0"
88
activityCompose = "1.9.2"
99
navigationCompose = "2.7.0-alpha07"
10-
detekt = "1.23.6"
11-
androidDesugaring = "2.1.1"
10+
detekt = "1.23.7"
11+
androidDesugaring = "2.1.2"
1212
androidMaterial = "1.12.0"
1313
constraintLayout = "2.1.4"
1414
koinCore = "3.5.6"
@@ -30,7 +30,7 @@ huaweiOsm = "1.3.35"
3030
navigation = "2.8.0"
3131
playCoreReview = "2.0.1"
3232
kotlinXDateTime = "0.6.1"
33-
coroutines = "1.8.1"
33+
coroutines = "1.9.0"
3434
billing = "7.0.0"
3535
leakCanary = "2.14"
3636
sqlDelight = "1.5.5"
@@ -39,7 +39,7 @@ mokoResources = "0.24.2"
3939
buildKonfig = "0.15.2"
4040
splashScreen = "1.0.1"
4141
kover = "0.8.3"
42-
rootBeer = "0.1.0"
42+
rootBeer = "0.1.1"
4343
anrWatchDog = "1.4.0"
4444
kermit = "2.0.4"
4545
konsist = "0.15.1"

renovate.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@
2121
"packageRules": [
2222
{
2323
"matchPackagePatterns": [
24-
"^org.jetbrains.kotlin",
24+
"^org.jetbrains.kotlin:",
25+
"^org.jetbrains.kotlin.",
2526
"^com.google.devtools.ksp",
2627
"^org.jetbrains.compose"
2728
],

0 commit comments

Comments
 (0)