Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
mustafaozhan committed Sep 24, 2024
2 parents 5e19bbd + dc51682 commit 544cbea
Show file tree
Hide file tree
Showing 12 changed files with 22 additions and 21 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ jobs:
steps:

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

- name: Adding secret files
uses: ./.github/actions/add-secret-files
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ jobs:
steps:

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

- name: Adding secret files
uses: ./.github/actions/add-secret-files
Expand Down Expand Up @@ -153,7 +153,7 @@ jobs:
steps:

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

- name: Adding secret files
uses: ./.github/actions/add-secret-files
Expand Down Expand Up @@ -237,7 +237,7 @@ jobs:
steps:

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

- name: Test
run: ./gradlew test
Expand All @@ -257,7 +257,7 @@ jobs:
steps:

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

- name: Generate Coverage
run: ./gradlew koverXmlReport
Expand Down Expand Up @@ -300,7 +300,7 @@ jobs:
steps:

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

- name: Detekt & Lint
run: ./gradlew detektAll lint
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/project.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ on:

jobs:
ProjectAutomations:
uses: Oztechan/Global/.github/workflows/reusable-project.yml@f2926167f4c8103dca1abd9cf2908c83733e1898
uses: Oztechan/Global/.github/workflows/reusable-project.yml@873e06320ffabbaa07f705b7ea059c248a070f88
with:
project_id: 2
secrets: inherit
2 changes: 1 addition & 1 deletion .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
jobs:

PublishRelease:
uses: Oztechan/Global/.github/workflows/reusable-publish.yml@f2926167f4c8103dca1abd9cf2908c83733e1898
uses: Oztechan/Global/.github/workflows/reusable-publish.yml@873e06320ffabbaa07f705b7ea059c248a070f88
with:
slack_channel: "ccc-github"
secrets: inherit
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ jobs:
steps:

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

- name: Adding secret files
uses: ./.github/actions/add-secret-files
Expand Down Expand Up @@ -215,7 +215,7 @@ jobs:
status: ${{ steps.status.outputs.status }}
steps:
- name: Setup Gradle Repo
uses: Oztechan/Global/actions/setup-gradle-repo@f2926167f4c8103dca1abd9cf2908c83733e1898
uses: Oztechan/Global/actions/setup-gradle-repo@873e06320ffabbaa07f705b7ea059c248a070f88

- name: Adding secret files
uses: ./.github/actions/add-secret-files
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
android.useAndroidX=true
android.enableJetifier=true
# Gradle
org.gradle.jvmargs=-Xmx8g -XX:MaxMetaspaceSize=2g -XX:+HeapDumpOnOutOfMemoryError -XX:+UseParallelGC -Dfile.encoding=UTF-8 -Dkotlin.daemon.jvm.options\="-Xmx8g"
org.gradle.jvmargs=-Xmx4g -Dkotlin.daemon.jvm.options=-Xmx2G -XX:MaxMetaspaceSize=2g -XX:+HeapDumpOnOutOfMemoryError -XX:+UseParallelGC -Dfile.encoding=UTF-8
org.gradle.parallel=true
org.gradle.caching=true
org.gradle.daemon=true
Expand Down
10 changes: 5 additions & 5 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
[versions]

kotlin = "2.0.20"
androidGradlePlugin = "8.6.0"
androidGradlePlugin = "8.6.1"
jetbrainsCompose = "1.6.11"
glance = "1.1.0"
mokkery = "2.3.0"
activityCompose = "1.9.2"
navigationCompose = "2.7.0-alpha07"
detekt = "1.23.6"
androidDesugaring = "2.1.1"
detekt = "1.23.7"
androidDesugaring = "2.1.2"
androidMaterial = "1.12.0"
constraintLayout = "2.1.4"
koinCore = "3.5.6"
Expand All @@ -30,7 +30,7 @@ huaweiOsm = "1.3.35"
navigation = "2.8.0"
playCoreReview = "2.0.1"
kotlinXDateTime = "0.6.1"
coroutines = "1.8.1"
coroutines = "1.9.0"
billing = "7.0.0"
leakCanary = "2.14"
sqlDelight = "1.5.5"
Expand All @@ -39,7 +39,7 @@ mokoResources = "0.24.2"
buildKonfig = "0.15.2"
splashScreen = "1.0.1"
kover = "0.8.3"
rootBeer = "0.1.0"
rootBeer = "0.1.1"
anrWatchDog = "1.4.0"
kermit = "2.0.4"
konsist = "0.15.1"
Expand Down
3 changes: 2 additions & 1 deletion renovate.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@
"packageRules": [
{
"matchPackagePatterns": [
"^org.jetbrains.kotlin",
"^org.jetbrains.kotlin:",
"^org.jetbrains.kotlin.",
"^com.google.devtools.ksp",
"^org.jetbrains.compose"
],
Expand Down

0 comments on commit 544cbea

Please sign in to comment.