Skip to content

Remove deleted gradle API used by buildsystem plugin, Fixes AB#3689387 #444

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

Open
ridam-arora wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Remove deleted gradle API used by buildsystem plugin, Fixes AB#3689387 #444

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
29d62fc
change gradle API used by buildsystem plugin
ridam-arora Jul 9, 2026
304d511
remove unwated publishing changes
ridam-arora Jul 9, 2026
0902aa1
upgrade spotBugsGradlePluginVersionFrom 4.7.1 to 6.5.8
ridam-arora Jul 16, 2026
8fc8127
change current version name
ridam-arora Jul 16, 2026
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 gradle/versions.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ ext {
// Plugins
gradleVersion = '8.10.0'
kotlinVersion = '1.8.0'
spotBugsGradlePluginVersion = '4.7.1'
spotBugsGradlePluginVersion = '6.5.8'
jupiterApiVersion = '5.6.0'

//Java Language Support
Expand Down
4 changes: 2 additions & 2 deletions plugins/buildsystem/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ plugins {
}

group 'com.microsoft.identity'
version '0.2.5'
version '0.2.6'

tasks.withType(JavaCompile) {
sourceCompatibility = '11'
Expand Down Expand Up @@ -55,7 +55,7 @@ dependencies {
testImplementation "org.junit.jupiter:junit-jupiter-api:${rootProject.ext.jupiterApiVersion}"
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine'
implementation "com.android.tools.build:gradle:${rootProject.ext.gradleVersion}"
implementation "gradle.plugin.com.github.spotbugs.snom:spotbugs-gradle-plugin:${rootProject.ext.spotBugsGradlePluginVersion}"
implementation "com.github.spotbugs.snom:spotbugs-gradle-plugin:${rootProject.ext.spotBugsGradlePluginVersion}"

implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:${rootProject.ext.kotlinVersion}"
testImplementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:${rootProject.ext.kotlinVersion}"
Expand Down
5 changes: 5 additions & 0 deletions plugins/buildsystem/changelog
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
Plugin Overview: https://github.com/AzureAD/android-complete/blob/master/plugins/buildsystem/docs/Overview.md

Version 0.2.6

@somalaya somalaya Jul 22, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The changelog entries for 0.2.6 are both tagged [MINOR] but the version was bumped as a patch (0.2.5 → 0.2.6), not a minor (0.2.5 → 0.3.0).

@ridam-arora ridam-arora Jul 23, 2026

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you're right, I would tag the changes as minor instead of patch, so I will need to change the artifact version, we may need to delete this 0.2.6 from maven feed though for consistency

----------------------------
[MINOR] Remove use of deleted gradle APIs
[MINOR] Bump SpotBugs Gradle plugin 4.7.1 -> 6.5.8 (4.x used the removed JavaPluginConvention); groupId changed to com.github.spotbugs.snom

Version 0.2.3
----------------------------
[PATCH] Allow ability to enable/disable code coverage - disabled by default
Expand Down
2 changes: 1 addition & 1 deletion plugins/buildsystem/gradle/versions.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Variables for plugins project
ext {
kotlinVersion = '1.8.0'
spotBugsGradlePluginVersion = '4.7.1'
spotBugsGradlePluginVersion = '6.5.8'
jupiterApiVersion = '5.6.0'
gradleVersion = '8.10.0'
}
10 changes: 5 additions & 5 deletions plugins/buildsystem/src/main/java/com/microsoft/identity/buildsystem/BuildPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,13 @@
import org.gradle.api.JavaVersion;
import org.gradle.api.Plugin;
import org.gradle.api.Project;
import org.gradle.api.plugins.JavaPluginExtension;

public class BuildPlugin implements Plugin<Project> {

private final static String ANDROID_LIBRARY_PLUGIN_ID = "com.android.library";
private final static String JAVA_LIBRARY_PLUGIN_ID = "java-library";

private final static String JAVA_SOURCE_COMPATIBILITY_PROPERTY = "sourceCompatibility";
private final static String JAVA_TARGET_COMPATIBILITY_PROPERTY = "targetCompatibility";

@Override
public void apply(final Project project) {

Expand Down Expand Up @@ -70,8 +68,10 @@ private void applyDesugaringToAndroidProject(final Project project){

private void applyJava8ToJavaProject(final Project project) {
project.getPluginManager().withPlugin(JAVA_LIBRARY_PLUGIN_ID, appliedPlugin -> {
project.setProperty(JAVA_SOURCE_COMPATIBILITY_PROPERTY, JavaVersion.VERSION_1_8);
project.setProperty(JAVA_TARGET_COMPATIBILITY_PROPERTY, JavaVersion.VERSION_1_8);
final JavaPluginExtension javaPluginExtension = project.getExtensions()
.getByType(JavaPluginExtension.class);
javaPluginExtension.setSourceCompatibility(JavaVersion.VERSION_1_8);
javaPluginExtension.setTargetCompatibility(JavaVersion.VERSION_1_8);
});
}
}
Loading