diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3da6a9df5..4fc7c06cf 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -80,9 +80,6 @@ jobs: key: cmake-default-${{ hashFiles('gradle/libs.versions.toml', 'app/build.gradle.kts', 'app/src/main/cpp/CMakeLists.txt') }} restore-keys: cmake-default- - - name: Install Build Tools - run: echo "y" | ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --install "build-tools;35.0.0-rc1" - - name: Build OSS run: ./gradlew assembleDefaultOssRelease diff --git a/.github/workflows/releases.yml b/.github/workflows/releases.yml index 6936b16bc..4942c986e 100644 --- a/.github/workflows/releases.yml +++ b/.github/workflows/releases.yml @@ -36,9 +36,6 @@ jobs: key: ${{ runner.os }}-cmake-${{ hashFiles('gradle/libs.versions.toml', 'app/build.gradle.kts', 'app/src/main/cpp/CMakeLists.txt') }} restore-keys: ${{ runner.os }}-cmake- - - name: Install Build Tools - run: echo "y" | ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --install "build-tools;35.0.0-rc1" - - name: Gradle Build uses: gradle/actions/setup-gradle@v3 with: diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 77cf1983e..9f7f6c41f 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -19,8 +19,7 @@ plugins { } android { - compileSdkPreview = "VanillaIceCream" - buildToolsVersion = "35.0.0-rc1" + compileSdk = 34 ndkVersion = "26.2.11394342" splits { diff --git a/gradle.properties b/gradle.properties index c24c1f5bf..f5bcb2e19 100644 --- a/gradle.properties +++ b/gradle.properties @@ -22,5 +22,3 @@ org.gradle.configuration-cache=true android.useAndroidX=true android.enableAppCompileTimeRClass=true android.experimental.enableNewResourceShrinker.preciseShrinking=true -android.injected.testOnly=false -android.suppressUnsupportedCompileSdk=VanillaIceCream