Skip to content

[Feat][SDK- 354] Bump android target sdk to 33 #339

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.

Sign up for GitHub

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

Merged
buongarzoni merged 4 commits into from
Jun 30, 2025
Merged

[Feat][SDK- 354] Bump android target sdk to 33 #339

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c5e54f1
build: update compile and target sdk to 33
buongarzoni Jun 27, 2025
2a8e339
build: exclude :rollbar-android and :examples:rollbar-android modules…
buongarzoni Jun 27, 2025
d659456
temporary because of this issue https://github.com/nebula-plugins/neb…
buongarzoni Jun 27, 2025
0759034
build: set compatibility with Java 8
buongarzoni Jun 27, 2025
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
4 changes: 2 additions & 2 deletions examples/rollbar-android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@ buildscript {
apply plugin: 'com.android.application'

android {
compileSdkVersion 30
compileSdkVersion 33
buildToolsVersion "30.0.3"
defaultConfig {
applicationId "com.rollbar.example.android"
minSdkVersion 21
// FIXME: Pending further discussion
//noinspection ExpiredTargetSdkVersion
targetSdkVersion 30
targetSdkVersion 33
versionCode 1
versionName "1.0"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
Expand Down
9 changes: 7 additions & 2 deletions rollbar-android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,14 @@ apply from: "$rootDir/gradle/release.gradle"
apply from: "$rootDir/gradle/android.quality.gradle"

android {
compileSdkVersion 30
compileSdkVersion 33
buildToolsVersion '30.0.3' // Going above here requires bumping the AGP to version 4+

defaultConfig {
minSdkVersion 21
// FIXME: Pending further discussion
//noinspection ExpiredTargetSdkVersion
targetSdkVersion 30
targetSdkVersion 33
consumerProguardFiles 'proguard-rules.pro'
manifestPlaceholders = [notifierVersion: VERSION_NAME]
}
Expand All @@ -38,6 +38,11 @@ android {
testCoverageEnabled true
}
}

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
}

dependencies {
Expand Down
3 changes: 3 additions & 0 deletions rollbar-java/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ buildscript {
dependencies {
classpath "com.netflix.nebula:nebula-project-plugin:3.4.0"
}
configurations.classpath {
resolutionStrategy.force 'com.netflix.nebula:nebula-gradle-interop:2.3.0'
}
}

apply plugin: "nebula.integtest"
Expand Down
3 changes: 3 additions & 0 deletions rollbar-reactive-streams/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ buildscript {
dependencies {
classpath "com.netflix.nebula:nebula-project-plugin:3.4.0"
}
configurations.classpath {
resolutionStrategy.force 'com.netflix.nebula:nebula-gradle-interop:2.3.0'
}
}

apply plugin: "nebula.integtest"
Expand Down
12 changes: 10 additions & 2 deletions settings.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ rootProject.name="rollbar-java-sdk"

include ":rollbar-api",
":rollbar-java",
":rollbar-android",
":rollbar-web",
":rollbar-jakarta-web",
":rollbar-log4j2",
Expand All @@ -16,7 +15,6 @@ include ":rollbar-api",
":rollbar-reactive-streams-reactor",
":examples:rollbar-java",
":examples:rollbar-web",
":examples:rollbar-android",
":examples:rollbar-scala",
":examples:rollbar-log4j2",
":examples:rollbar-logback",
Expand All @@ -25,3 +23,13 @@ include ":rollbar-api",
":examples:rollbar-struts2",
":examples:rollbar-struts2-spring",
":examples:rollbar-reactive-streams-reactor"

def isJava8 = JavaVersion.current() == JavaVersion.VERSION_1_8

if (isJava8) {
println "Java 8 detected: excluding :rollbar-android and :examples:rollbar-android"
} else {
println "Java ${JavaVersion.current()} detected: including Android modules"
include ":rollbar-android",
":examples:rollbar-android"
}