Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[andr] Bump android deps to API level 35 (OS 15) #173

Draft
wants to merge 7 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .bazelrc
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ build --host_macos_minimum_os=12.5
build --ios_minimum_os=12.0
build --ios_simulator_device="iPhone 13"
build --ios_simulator_version=17.5
build --xcode_version=15.4
murki marked this conversation as resolved.
Show resolved Hide resolved
build --xcode_version=16.1

build:clippy --aspects=@rules_rust//rust:defs.bzl%rust_clippy_aspect
build:clippy --output_groups=+clippy_checks
Expand Down
4 changes: 2 additions & 2 deletions WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -183,11 +183,11 @@ load("//bazel/android:configure.bzl", "android_configure")

android_configure(
name = "local_config_android",
build_tools_version = "34.0.0",
build_tools_version = "35.0.0",
# This value is the minimum supported Android sdk version.
ndk_api_level = 21,
# This is the target SDK version.
sdk_api_level = 34,
sdk_api_level = 35,
)

load("@local_config_android//:android_configure.bzl", "android_workspace")
Expand Down
2 changes: 1 addition & 1 deletion bazel/android/artifacts.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -312,6 +312,6 @@ def _manifest(package_name):

<uses-sdk
android:minSdkVersion="21"
android:targetSdkVersion="34"/>
android:targetSdkVersion="35"/>
</manifest>
""".format(package_name)
2 changes: 1 addition & 1 deletion platform/jvm/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<uses-sdk
android:minSdkVersion="21"
android:targetSdkVersion="34"
android:targetSdkVersion="35"
/>

<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
Expand Down
2 changes: 1 addition & 1 deletion platform/jvm/capture-apollo3/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ group = "io.bitdrift"

android {
namespace = "io.bitdrift.capture.apollo3"
compileSdk = 34
compileSdk = 35

defaultConfig {
minSdk = 21
Expand Down
2 changes: 1 addition & 1 deletion platform/jvm/capture-timber/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ group = "io.bitdrift"

android {
namespace = "io.bitdrift.capture.timber"
compileSdk = 34
compileSdk = 35

defaultConfig {
minSdk = 21
Expand Down
4 changes: 2 additions & 2 deletions platform/jvm/capture/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ dependencies {
android {
namespace = "io.bitdrift.capture"

compileSdk = 34
buildToolsVersion = "34.0.0"
compileSdk = 35
buildToolsVersion = "35.0.0"

defaultConfig {
ndkVersion = "27"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ internal class AppMemoryPressureListenerLogger(
private val executor: ExecutorService,
) : IEventListenerLogger, ComponentCallbacks2 {

// TODO(murki): Remove the usage of these fields altogether
@Suppress("DEPRECATION")
private fun getTrimLevelAsString(level: Int): String {
return when (level) {
ComponentCallbacks2.TRIM_MEMORY_BACKGROUND -> "TRIM_MEMORY_BACKGROUND"
Expand Down
2 changes: 1 addition & 1 deletion platform/jvm/common/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<uses-sdk
android:minSdkVersion="21"
android:targetSdkVersion="34"
android:targetSdkVersion="35"
/>

<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
Expand Down
2 changes: 1 addition & 1 deletion platform/jvm/common/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ plugins {
android {
namespace = "io.bitdrift.capture.common"

compileSdk = 34
compileSdk = 35

compileOptions {
sourceCompatibility = JavaVersion.VERSION_1_8
Expand Down
2 changes: 1 addition & 1 deletion platform/jvm/gradle-test-app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/Theme.MyApplication"
tools:targetApi="34">
tools:targetApi="35">
<activity
android:name=".MainActivity"
android:exported="true"
Expand Down
2 changes: 1 addition & 1 deletion platform/jvm/gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[versions]
androidBenchkmarkPlugin = "1.2.4"
androidGradlePlugin = "8.2.2" # have to pin to this version due to 8.3.x breaking our lint https://issuetracker.google.com/issues/332755363
androidGradlePlugin = "8.8.0-rc02"
apollo = "3.8.3"
appcompat = "1.5.1"
assertjCore = "3.22.0"
Expand Down
2 changes: 1 addition & 1 deletion platform/jvm/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
2 changes: 1 addition & 1 deletion platform/jvm/microbenchmark/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ plugins {

android {
namespace = "io.bitdrift.microbenchmark"
compileSdk = 34
compileSdk = 35

compileOptions {
sourceCompatibility = JavaVersion.VERSION_1_8
Expand Down
2 changes: 1 addition & 1 deletion platform/jvm/replay/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<uses-sdk
android:minSdkVersion="21"
android:targetSdkVersion="34"
android:targetSdkVersion="35"
/>

<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
Expand Down
2 changes: 1 addition & 1 deletion platform/jvm/replay/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ dependencies {
android {
namespace = "io.bitdrift.capture.replay"

compileSdk = 34
compileSdk = 35

defaultConfig {
minSdk = 21
Expand Down
4 changes: 2 additions & 2 deletions tools/android_sdk_wrapper.sh
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ readonly install_android_sdk_packages_command=(
"--install"
"platform-tools"
"ndk;$ndk_version"
"platforms;android-34"
"build-tools;34.0.0"
"platforms;android-35"
"build-tools;35.0.0"
)

function download_android_sdk() {
Expand Down
Loading