From bdf513f8bdb2b41489162f5681f80e710eb4e7bb Mon Sep 17 00:00:00 2001 From: Caner Karaca <37447503+CanerKaraca23@users.noreply.github.com> Date: Sun, 1 Dec 2024 16:28:58 +0000 Subject: [PATCH] Update --- .github/workflows/clippy.yml | 7 +++---- manager/build.gradle.kts | 4 +--- manager/gradle/libs.versions.toml | 4 ++-- userspace/ksud/Cargo.lock | 8 ++++---- 4 files changed, 10 insertions(+), 13 deletions(-) diff --git a/.github/workflows/clippy.yml b/.github/workflows/clippy.yml index 2ea5bc48b5eb..6d2eb4c570c2 100644 --- a/.github/workflows/clippy.yml +++ b/.github/workflows/clippy.yml @@ -22,16 +22,15 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - run: rustup update --force-non-host stable-x86_64-unknown-linux-gnu + - run: rustup update nightly - uses: Swatinem/rust-cache@v2 with: workspaces: userspace/ksud - name: Install cross - run: | - cargo install cross --git https://github.com/cross-rs/cross --rev 66845c1 + run: cargo install cross - name: Run clippy run: | cross clippy --manifest-path userspace/ksud/Cargo.toml --target aarch64-linux-android --release - cross clippy --manifest-path userspace/ksud/Cargo.toml --target x86_64-linux-android --release + cross clippy --manifest-path userspace/ksud/Cargo.toml --target x86_64-linux-android --release \ No newline at end of file diff --git a/manager/build.gradle.kts b/manager/build.gradle.kts index 3bb25ee907cc..31e7c372c5cb 100644 --- a/manager/build.gradle.kts +++ b/manager/build.gradle.kts @@ -30,8 +30,7 @@ cmaker { val androidMinSdkVersion = 26 val androidTargetSdkVersion = 35 val androidCompileSdkVersion = 35 -val androidBuildToolsVersion = "35.0.0" -val androidCompileNdkVersion = "27.0.12077973" +val androidCompileNdkVersion = "27.2.12479018" val androidSourceCompatibility = JavaVersion.VERSION_21 val androidTargetCompatibility = JavaVersion.VERSION_21 val managerVersionCode by extra(getVersionCode()) @@ -70,7 +69,6 @@ subprojects { extensions.configure(CommonExtension::class.java) { compileSdk = androidCompileSdkVersion ndkVersion = androidCompileNdkVersion - buildToolsVersion = androidBuildToolsVersion defaultConfig { minSdk = androidMinSdkVersion diff --git a/manager/gradle/libs.versions.toml b/manager/gradle/libs.versions.toml index 23a61029556e..ff9ee7e8b79e 100644 --- a/manager/gradle/libs.versions.toml +++ b/manager/gradle/libs.versions.toml @@ -1,7 +1,7 @@ [versions] agp = "8.7.2" -kotlin = "2.0.21" -ksp = "2.0.21-1.0.28" +kotlin = "2.1.0" +ksp = "2.1.0-1.0.29" compose-bom = "2024.11.00" lifecycle = "2.8.7" navigation = "2.8.4" diff --git a/userspace/ksud/Cargo.lock b/userspace/ksud/Cargo.lock index e5e11104f789..63b44ef92c7a 100644 --- a/userspace/ksud/Cargo.lock +++ b/userspace/ksud/Cargo.lock @@ -210,9 +210,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.8.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ac0150caa2ae65ca5bd83f25c7de183dea78d4d366469f148435e2acfbad0da" +checksum = "325918d6fe32f23b19878fe4b34794ae41fc19ddbe53b10571a4874d44ffd39b" [[package]] name = "cc" @@ -734,9 +734,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.6.0" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da" +checksum = "62f822373a4fe84d4bb149bf54e584a7f4abec90e072ed49cda0edea5b95471f" dependencies = [ "equivalent", "hashbrown 0.15.2",