Skip to content

Commit

Permalink
SDK VanillaIceCream Preview
Browse files Browse the repository at this point in the history
New dependencies changes:
• Update androidx.compose.ui:ui-tooling to 1.6.2
• Update androidx.navigation:navigation-fragment-(ktx) & ui-(ktx) to 2.7.7 
• Update com.android.tools.build:gradle to 8.4.0-alpha11
• Update com.google.firebase:firebase-bom to 32.7.2 
• Update com.google.firebase:firebase-messaging(-ktx) to 23.4.1 
• Update com.google.firebase:firebase-analytics(-ktx) to 21.5.1 
• Update com.google.gms:google-services to 4.4.1

Others Changes:
• Update versionCode to 392002 (3.9.2)
• Update compileSdkPreview to VanillaIceCream
• Update buildToolsVersion to 35.0.0-rc1
• Update Gradle to 8.7-rc-1
  • Loading branch information
AkosPaha01 authored Feb 23, 2024
2 parents 939c6ec + 5d2abc2 commit 5eec592
Show file tree
Hide file tree
Showing 10 changed files with 47 additions and 48 deletions.
14 changes: 7 additions & 7 deletions .github/workflows/buildCi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,20 +22,20 @@ jobs:

- uses: nttld/setup-ndk@v1
with:
ndk-version: r26b
ndk-version: r26c

- name: Get Commit Message
id: commitMessage
run: IN="${{ github.event.head_commit.message }}" && echo "message=${IN%%$'\n'*}" >> $GITHUB_OUTPUT

- name: Setup JDK
uses: actions/setup-java@v4.0.0
uses: actions/setup-java@v4
with:
java-version: 20
distribution: temurin

- name: Cache Gradle dependencies
uses: actions/cache@v4.0.0
uses: actions/cache@v4
with:
path: |
~/.gradle/caches
Expand All @@ -45,7 +45,7 @@ jobs:
restore-keys: ${{ runner.os }}-gradle-

- name: Cache build cache
uses: actions/cache@v4.0.0
uses: actions/cache@v4
with:
path: |
${{ github.workspace }}/.ccache
Expand All @@ -66,7 +66,7 @@ jobs:

- name: Build apk
id: buildAllApks
uses: gradle/gradle-build-action@v3.0.0
uses: gradle/gradle-build-action@v3
with:
gradle-version: wrapper
arguments: assembleDebug
Expand All @@ -85,7 +85,7 @@ jobs:
signingKey: ${{ secrets.SIGNING_KEY }}
keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }}
keyPassword: ${{ secrets.KEY_PASSWORD }}
buildToolsVersion: 34.0.0
buildToolsVersion: "35.0.0 rc1"

- name: Delete old APK
run: rm app/build/outputs/apk/debug/app-debug.apk
Expand All @@ -94,7 +94,7 @@ jobs:
run: mv app/build/outputs/apk/debug/app-debug-signed.apk app/build/outputs/apk/debug/app-debug.apk

- name: Upload Artifact
uses: actions/upload-artifact@v4.3.0
uses: actions/upload-artifact@v4
with:
name: Debug Artifact
path: app/build/outputs/apk/debug/app-debug.apk
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/buildPro.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@ jobs:
run: IN="${{ github.event.head_commit.message }}" && echo "::set-output name=message::${IN%%$'\n'*}"

- name: Setup JDK
uses: actions/setup-java@v4.0.0
uses: actions/setup-java@v4
with:
java-version: 20
distribution: temurin

- name: Cache Gradle dependencies
uses: actions/cache@v4.0.0
uses: actions/cache@v4
with:
path: |
~/.gradle/caches
Expand All @@ -34,7 +34,7 @@ jobs:
restore-keys: ${{ runner.os }}-gradle-

- name: Cache build cache
uses: actions/cache@v4.0.0
uses: actions/cache@v4
with:
path: |
${{ github.workspace }}/.ccache
Expand All @@ -47,7 +47,7 @@ jobs:

- name: Build apk
id: buildAllApks
uses: gradle/gradle-build-action@v3.0.0
uses: gradle/gradle-build-action@v3
with:
gradle-version: wrapper
arguments: assemblePro
Expand All @@ -74,7 +74,7 @@ jobs:
keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }}
keyPassword: ${{ secrets.KEY_PASSWORD }}
env:
BUILD_TOOLS_VERSION: 33.0.0
buildToolsVersion: '35.0.0-rc1'

- name: List files
run: ls app/build/outputs/apk/pro
Expand All @@ -83,7 +83,7 @@ jobs:
run: mv app/build/outputs/apk/pro/app-pro-unsigned-signed.apk app/build/outputs/apk/pro/app-pro.apk

- name: Upload Artifact
uses: actions/upload-artifact@v4.3.0
uses: actions/upload-artifact@v4
with:
name: Release Artifact
path: app/build/outputs/apk/pro/app-pro.apk
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/buildRelease.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,14 @@ jobs:

- uses: nttld/setup-ndk@v1
with:
ndk-version: r26b
ndk-version: r26c

- name: Get Commit Message
id: commitMessage
run: IN="${{ github.event.head_commit.message }}" && echo "::set-output name=message::${IN%%$'\n'*}"

- name: Setup JDK
uses: actions/setup-java@v4.0.0
uses: actions/setup-java@v4
with:
java-version: 20
distribution: temurin
Expand Down Expand Up @@ -63,7 +63,7 @@ jobs:

- name: Build apk
id: buildAllApks
uses: gradle/gradle-build-action@v3.0.0
uses: gradle/gradle-build-action@v3
with:
gradle-version: wrapper
arguments: assembleRelease
Expand All @@ -89,7 +89,7 @@ jobs:
signingKey: ${{ secrets.SIGNING_KEY }}
keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }}
keyPassword: ${{ secrets.KEY_PASSWORD }}
buildToolsVersion: 34.0.0
buildToolsVersion: '35.0.0-rc1'

- name: List files
run: ls app/build/outputs/apk/release
Expand All @@ -98,7 +98,7 @@ jobs:
run: mv app/build/outputs/apk/release/app-release-unsigned-signed.apk app/build/outputs/apk/release/app-release.apk

- name: Upload Artifact
uses: actions/upload-artifact@v4.3.0
uses: actions/upload-artifact@v4
with:
name: Release Artifact
path: app/build/outputs/apk/release/app-release.apk
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/deployToGoogle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,16 @@ jobs:

- uses: nttld/setup-ndk@v1
with:
ndk-version: r26b
ndk-version: r26c

- name: Setup JDK
uses: actions/setup-java@v4.0.0
uses: actions/setup-java@v4
with:
java-version: 20
distribution: temurin

- name: Cache Gradle dependencies
uses: actions/cache@v4.0.0
uses: actions/cache@v4
with:
path: |
~/.gradle/caches
Expand All @@ -44,7 +44,7 @@ jobs:
restore-keys: ${{ runner.os }}-gradle-

- name: Cache build cache
uses: actions/cache@v4.0.0
uses: actions/cache@v4
with:
path: |
${{ github.workspace }}/.ccache
Expand All @@ -60,7 +60,7 @@ jobs:

- name: Build Bundle
id: buildBundle
uses: gradle/gradle-build-action@v3.0.0
uses: gradle/gradle-build-action@v3
with:
gradle-version: wrapper
arguments: bundleRelease
Expand All @@ -75,10 +75,10 @@ jobs:
keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }}
keyPassword: ${{ secrets.KEY_PASSWORD }}
env:
BUILD_TOOLS_VERSION: 33.0.0
buildToolsVersion: '35.0.0-rc1'

- name: Upload Artifact
uses: actions/upload-artifact@v4.3.0
uses: actions/upload-artifact@v4
with:
name: Artifact
path: app/build/outputs/bundle/release/app-release.aab
Expand All @@ -90,7 +90,7 @@ jobs:
run: echo '${{ secrets.SERVICE_ACCOUNT_JSON }}' > service_account.json

- name: Deploy to Production
uses: r0adkll/upload-google-play@v1.1.2
uses: r0adkll/upload-google-play@v1.1.3
with:
serviceAccountJson: service_account.json
packageName: de.dertyp7214.rboardthememanager
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/pullRequest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ jobs:

- uses: nttld/setup-ndk@v1
with:
ndk-version: r26b
ndk-version: r26c

- name: Setup JDK
uses: actions/setup-java@v4.0.0
uses: actions/setup-java@v4
with:
java-version: 20
distribution: temurin
Expand Down Expand Up @@ -58,7 +58,7 @@ jobs:

- name: Build apk
id: buildAllApks
uses: gradle/gradle-build-action@v3.0.0
uses: gradle/gradle-build-action@v3
with:
gradle-version: wrapper
arguments: assembleDebug
Expand All @@ -73,13 +73,13 @@ jobs:
echo "::set-output name=json::$content"
- name: Upload Artifact
uses: actions/upload-artifact@v4.3.0
uses: actions/upload-artifact@v4
with:
name: Debug Artifact
path: app/build/outputs/apk/debug/app-debug.apk

- name: Check if release already exists
uses: mukunku/tag-exists-action@v1.5.0
uses: mukunku/tag-exists-action@v1.6.0
id: checkTag
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand Down
1 change: 0 additions & 1 deletion .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ plugins {
}

android {
buildToolsVersion = "34.0.0"
compileSdk = 34
buildToolsVersion = "35.0.0 rc1"
compileSdkPreview = "VanillaIceCream"
buildFeatures.dataBinding = true
buildFeatures.viewBinding = true
buildFeatures.buildConfig = true
Expand All @@ -25,7 +25,7 @@ android {
applicationId = "de.dertyp7214.rboardthememanager"
minSdk = 31
targetSdk = 34
versionCode = 392000
versionCode = 392002
versionName = "3.9.2"

testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ android.enableJetifier=true
# Kotlin code style for this project: "official" or "obsolete":
kotlin.code.style=official
android.injected.testOnly=false
android.suppressUnsupportedCompileSdk=33,UpsideDownCake,34
android.suppressUnsupportedCompileSdk=33,UpsideDownCake,34,VanillaIceCream
20 changes: 10 additions & 10 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,30 +19,30 @@ lifecycle-viewmodel-ktx = "2.7.0"
browser = "1.7.0"
glide = "4.16.0"
flagkit = "1.0.2"
firebase-bom = "32.7.1"
firebase-messaging-ktx = "23.4.0"
firebase-analytics-ktx = "21.5.0"
firebase-bom = "32.7.2"
firebase-messaging-ktx = "23.4.1"
firebase-analytics-ktx = "21.5.1"
legacy-support-v4 = "1.0.0"
navigation-fragment-ktx = "2.7.6"
navigation-ui-ktx = "2.7.6"
navigation-fragment-ktx = "2.7.7"
navigation-ui-ktx = "2.7.7"
commons-text = "1.11.0"
core-ktx = "1.12.0"
core = "1.12.0"
material = "1.11.0"
espresso-core = "3.5.1"
android-shell = "1.0.0"
firebase-analytics = "21.5.0"
firebase-messaging = "23.4.0"
firebase-analytics = "21.5.1"
firebase-messaging = "23.4.1"
gson = "2.10.1"
protobufDynamic = "1.0.1"
simple-item-decoration = "1.0.0"
balloon = "1.6.4"
kspPlugin = "1.9.22-1.0.17"
dotsIndicator = "5.0"

googleServices = "4.4.0"
gradle = "8.4.0-alpha07"
uiTooling = "1.6.0"
googleServices = "4.4.1"
gradle = "8.4.0-alpha11"
uiTooling = "1.6.2"
kotlin = "1.9.22"

[libraries]
Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#Thu Feb 01 20:47:07 CET 2024
#Mon Feb 19 15:40:13 CET 2024
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-rc-4-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

0 comments on commit 5eec592

Please sign in to comment.