Skip to content

Commit 6a72e7b

Browse files
authored
[Feat][SDK- 354] Bump android target sdk to 33 (#339)
* build: update compile and target sdk to 33 * build: exclude :rollbar-android and :examples:rollbar-android modules from java 8 build * temporary because of this issue nebula-plugins/nebula-gradle-interop#20 * build: set compatibility with Java 8 --------- Co-authored-by: chris <[email protected]>
1 parent 0070c47 commit 6a72e7b

File tree

5 files changed

+25
-6
lines changed

5 files changed

+25
-6
lines changed

examples/rollbar-android/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@ buildscript {
1111
apply plugin: 'com.android.application'
1212

1313
android {
14-
compileSdkVersion 30
14+
compileSdkVersion 33
1515
buildToolsVersion "30.0.3"
1616
defaultConfig {
1717
applicationId "com.rollbar.example.android"
1818
minSdkVersion 21
1919
// FIXME: Pending further discussion
2020
//noinspection ExpiredTargetSdkVersion
21-
targetSdkVersion 30
21+
targetSdkVersion 33
2222
versionCode 1
2323
versionName "1.0"
2424
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"

rollbar-android/build.gradle

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@ apply from: "$rootDir/gradle/release.gradle"
1818
apply from: "$rootDir/gradle/android.quality.gradle"
1919

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

2424
defaultConfig {
2525
minSdkVersion 21
2626
// FIXME: Pending further discussion
2727
//noinspection ExpiredTargetSdkVersion
28-
targetSdkVersion 30
28+
targetSdkVersion 33
2929
consumerProguardFiles 'proguard-rules.pro'
3030
manifestPlaceholders = [notifierVersion: VERSION_NAME]
3131
}
@@ -38,6 +38,11 @@ android {
3838
testCoverageEnabled true
3939
}
4040
}
41+
42+
compileOptions {
43+
sourceCompatibility JavaVersion.VERSION_1_8
44+
targetCompatibility JavaVersion.VERSION_1_8
45+
}
4146
}
4247

4348
dependencies {

rollbar-java/build.gradle

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ buildscript {
77
dependencies {
88
classpath "com.netflix.nebula:nebula-project-plugin:3.4.0"
99
}
10+
configurations.classpath {
11+
resolutionStrategy.force 'com.netflix.nebula:nebula-gradle-interop:2.3.0'
12+
}
1013
}
1114

1215
apply plugin: "nebula.integtest"

rollbar-reactive-streams/build.gradle

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ buildscript {
77
dependencies {
88
classpath "com.netflix.nebula:nebula-project-plugin:3.4.0"
99
}
10+
configurations.classpath {
11+
resolutionStrategy.force 'com.netflix.nebula:nebula-gradle-interop:2.3.0'
12+
}
1013
}
1114

1215
apply plugin: "nebula.integtest"

settings.gradle

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ rootProject.name="rollbar-java-sdk"
22

33
include ":rollbar-api",
44
":rollbar-java",
5-
":rollbar-android",
65
":rollbar-web",
76
":rollbar-jakarta-web",
87
":rollbar-log4j2",
@@ -16,7 +15,6 @@ include ":rollbar-api",
1615
":rollbar-reactive-streams-reactor",
1716
":examples:rollbar-java",
1817
":examples:rollbar-web",
19-
":examples:rollbar-android",
2018
":examples:rollbar-scala",
2119
":examples:rollbar-log4j2",
2220
":examples:rollbar-logback",
@@ -25,3 +23,13 @@ include ":rollbar-api",
2523
":examples:rollbar-struts2",
2624
":examples:rollbar-struts2-spring",
2725
":examples:rollbar-reactive-streams-reactor"
26+
27+
def isJava8 = JavaVersion.current() == JavaVersion.VERSION_1_8
28+
29+
if (isJava8) {
30+
println "Java 8 detected: excluding :rollbar-android and :examples:rollbar-android"
31+
} else {
32+
println "Java ${JavaVersion.current()} detected: including Android modules"
33+
include ":rollbar-android",
34+
":examples:rollbar-android"
35+
}

0 commit comments

Comments
 (0)