diff --git a/plugins/buildsystem/build.gradle b/plugins/buildsystem/build.gradle index 8ed9d8ab..561231c0 100644 --- a/plugins/buildsystem/build.gradle +++ b/plugins/buildsystem/build.gradle @@ -10,7 +10,7 @@ plugins { } group 'com.microsoft.identity' -version '0.2.5' +version '0.2.6-dev' tasks.withType(JavaCompile) { sourceCompatibility = '11' diff --git a/plugins/buildsystem/changelog b/plugins/buildsystem/changelog index d1406ed0..10044df5 100644 --- a/plugins/buildsystem/changelog +++ b/plugins/buildsystem/changelog @@ -1,5 +1,9 @@ Plugin Overview: https://github.com/AzureAD/android-complete/blob/master/plugins/buildsystem/docs/Overview.md +Version 0.2.6 +---------------------------- +[MINOR] Remove use of deleted gradle APIs + Version 0.2.3 ---------------------------- [PATCH] Allow ability to enable/disable code coverage - disabled by default diff --git a/plugins/buildsystem/src/main/java/com/microsoft/identity/buildsystem/BuildPlugin.java b/plugins/buildsystem/src/main/java/com/microsoft/identity/buildsystem/BuildPlugin.java index 32216c28..f1a0838f 100644 --- a/plugins/buildsystem/src/main/java/com/microsoft/identity/buildsystem/BuildPlugin.java +++ b/plugins/buildsystem/src/main/java/com/microsoft/identity/buildsystem/BuildPlugin.java @@ -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 { 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) { @@ -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); }); } }