diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4ce7ef30a4..d94254afb5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -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 diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 2899e81b02..b7cea17ef4 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 diff --git a/.github/workflows/project.yml b/.github/workflows/project.yml index 0807b6b1df..637988e1b0 100644 --- a/.github/workflows/project.yml +++ b/.github/workflows/project.yml @@ -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 diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index f6003fbe2c..daa68255cd 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -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 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8ad471d483..64de6b2da9 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -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 @@ -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 diff --git a/gradle.properties b/gradle.properties index 1afbf57b37..158d12b5e7 100755 --- a/gradle.properties +++ b/gradle.properties @@ -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 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 5b2b1bdbb8..a95195a18f 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -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" @@ -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" @@ -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" diff --git a/renovate.json b/renovate.json index 3905c4e7ae..979913d0b1 100644 --- a/renovate.json +++ b/renovate.json @@ -21,7 +21,8 @@ "packageRules": [ { "matchPackagePatterns": [ - "^org.jetbrains.kotlin", + "^org.jetbrains.kotlin:", + "^org.jetbrains.kotlin.", "^com.google.devtools.ksp", "^org.jetbrains.compose" ], diff --git a/submodule/basemob b/submodule/basemob index 65b1d34931..eea72d106e 160000 --- a/submodule/basemob +++ b/submodule/basemob @@ -1 +1 @@ -Subproject commit 65b1d349314a915fff9339f7b1db8f22dce05085 +Subproject commit eea72d106e0d2cd18948d59ca52972af591d35dc diff --git a/submodule/logmob b/submodule/logmob index b2752881a3..a7b5272130 160000 --- a/submodule/logmob +++ b/submodule/logmob @@ -1 +1 @@ -Subproject commit b2752881a37579ccc3f485cdc201f89bb1365687 +Subproject commit a7b527213022dfc8e99417142e7d929a7d9ac43c diff --git a/submodule/parsermob b/submodule/parsermob index fac0b21ccd..e77e2b3def 160000 --- a/submodule/parsermob +++ b/submodule/parsermob @@ -1 +1 @@ -Subproject commit fac0b21ccd25bdc4d61393b4c65cb4e151236516 +Subproject commit e77e2b3defd5f0fdff559b8d9593db7414c3b86f diff --git a/submodule/scopemob b/submodule/scopemob index 34b38ad5a6..58afc90a17 160000 --- a/submodule/scopemob +++ b/submodule/scopemob @@ -1 +1 @@ -Subproject commit 34b38ad5a6de4018f1713e472c8dd185c145b83b +Subproject commit 58afc90a1705ca1c5c9b927b96579bb56c0f966a