From 2362c7ec5efef8fb6eb825b6f585dee953945dda Mon Sep 17 00:00:00 2001 From: Dhruv-Mishra Date: Tue, 26 Aug 2025 12:00:34 +0530 Subject: [PATCH 1/3] Gradle version upgrade --- FluentUI.Demo/build.gradle | 8 +++---- FluentUI.Demo/src/main/AndroidManifest.xml | 3 +-- FluentUI/build.gradle | 9 +++----- FluentUI/src/main/AndroidManifest.xml | 3 +-- build.gradle | 2 +- fluentui_calendar/build.gradle | 13 +++++------ .../src/main/AndroidManifest.xml | 3 +-- fluentui_ccb/build.gradle | 9 ++++---- fluentui_ccb/src/main/AndroidManifest.xml | 3 +-- fluentui_controls/build.gradle | 13 +++++------ .../src/main/AndroidManifest.xml | 3 +-- fluentui_core/build.gradle | 9 +++----- fluentui_core/src/main/AndroidManifest.xml | 3 +-- fluentui_drawer/build.gradle | 9 ++++---- fluentui_drawer/src/main/AndroidManifest.xml | 3 +-- fluentui_icons/build.gradle | 13 +++++------ fluentui_icons/src/main/AndroidManifest.xml | 2 +- fluentui_listitem/build.gradle | 9 ++++---- .../src/main/AndroidManifest.xml | 3 +-- fluentui_menus/build.gradle | 9 ++++---- fluentui_menus/src/main/AndroidManifest.xml | 3 +-- fluentui_notification/build.gradle | 13 +++++------ .../src/main/AndroidManifest.xml | 3 +-- fluentui_others/build.gradle | 13 +++++------ fluentui_others/src/main/AndroidManifest.xml | 3 +-- fluentui_peoplepicker/build.gradle | 13 +++++------ .../src/main/AndroidManifest.xml | 3 +-- fluentui_persona/build.gradle | 9 ++++---- fluentui_persona/src/main/AndroidManifest.xml | 3 +-- fluentui_progress/build.gradle | 13 +++++------ .../src/main/AndroidManifest.xml | 3 +-- fluentui_tablayout/build.gradle | 9 ++++---- .../src/main/AndroidManifest.xml | 3 +-- fluentui_topappbars/build.gradle | 22 ++++++++++--------- .../src/main/AndroidManifest.xml | 3 +-- fluentui_transients/build.gradle | 20 ++++++++++++----- .../src/main/AndroidManifest.xml | 3 +-- gradle.properties | 3 +++ gradle/wrapper/gradle-wrapper.properties | 2 +- 39 files changed, 125 insertions(+), 148 deletions(-) diff --git a/FluentUI.Demo/build.gradle b/FluentUI.Demo/build.gradle index a9db08acf..ef40be99a 100644 --- a/FluentUI.Demo/build.gradle +++ b/FluentUI.Demo/build.gradle @@ -31,10 +31,6 @@ android { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 } - lintOptions { - lintConfig = file("lint.xml") - abortOnError false - } buildTypes { release { minifyEnabled false @@ -74,6 +70,10 @@ android { } } } + namespace 'com.microsoft.fluentuidemo' + lint { + abortOnError false + } } dependencies { diff --git a/FluentUI.Demo/src/main/AndroidManifest.xml b/FluentUI.Demo/src/main/AndroidManifest.xml index d937e187a..27da6fb3e 100644 --- a/FluentUI.Demo/src/main/AndroidManifest.xml +++ b/FluentUI.Demo/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + diff --git a/FluentUI/build.gradle b/FluentUI/build.gradle index 8acde506d..ccfa0ec13 100644 --- a/FluentUI/build.gradle +++ b/FluentUI/build.gradle @@ -13,8 +13,6 @@ android { defaultConfig { minSdkVersion constants.minSdkVersion targetSdkVersion constants.targetSdkVersion - versionCode project.ext.FluentUI_version_code - versionName project.ext.FluentUI_versionid testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' consumerProguardFiles 'consumer-rules.pro' @@ -32,10 +30,9 @@ android { } lint { baseline = file("lint-baseline.xml") - } - lintOptions { abortOnError false } + namespace 'com.microsoft.fluentui_container' } dependencies { @@ -67,9 +64,9 @@ dependencies { implementation platform("androidx.compose:compose-bom:$composeBomVersion") } -task sourceJar(type: Jar) { +tasks.register('sourceJar', Jar) { from android.sourceSets.main.java.srcDirs - classifier "sources" + archiveClassifier.set("sources") } project.afterEvaluate { diff --git a/FluentUI/src/main/AndroidManifest.xml b/FluentUI/src/main/AndroidManifest.xml index 2c3509627..260ddcbbc 100644 --- a/FluentUI/src/main/AndroidManifest.xml +++ b/FluentUI/src/main/AndroidManifest.xml @@ -4,5 +4,4 @@ ~ Licensed under the MIT License. --> - + diff --git a/build.gradle b/build.gradle index 437c8a3b8..ec09a54b0 100644 --- a/build.gradle +++ b/build.gradle @@ -20,7 +20,7 @@ buildscript { } } dependencies { - classpath 'com.android.tools.build:gradle:7.4.2' + classpath 'com.android.tools.build:gradle:8.11.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "io.codearte.gradle.nexus:gradle-nexus-staging-plugin:$nexus_plugin_version" classpath "com.microsoft.hydralab:gradle_plugin:$hydra_client_plugin" diff --git a/fluentui_calendar/build.gradle b/fluentui_calendar/build.gradle index 339947952..16c06058a 100644 --- a/fluentui_calendar/build.gradle +++ b/fluentui_calendar/build.gradle @@ -14,17 +14,12 @@ android { defaultConfig { minSdkVersion constants.minSdkVersion targetSdkVersion constants.targetSdkVersion - versionCode project.ext.fluentui_calendar_version_code - versionName project.ext.fluentui_calendar_versionid testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' vectorDrawables.useSupportLibrary = true } buildFeatures { viewBinding true } - lintOptions { - abortOnError false - } buildTypes { release { minifyEnabled false @@ -38,6 +33,10 @@ android { } productFlavors { } + namespace 'com.microsoft.fluentui.calendar' + lint { + abortOnError false + } } gradle.taskGraph.whenReady { taskGraph -> @@ -62,9 +61,9 @@ dependencies { androidTestImplementation "androidx.test.espresso:espresso-core:$espressoVersion" } -task sourceJar(type: Jar) { +tasks.register('sourceJar', Jar) { from android.sourceSets.main.java.srcDirs - classifier "sources" + archiveClassifier.set("sources") } project.afterEvaluate { diff --git a/fluentui_calendar/src/main/AndroidManifest.xml b/fluentui_calendar/src/main/AndroidManifest.xml index fdf69949b..a5918e68a 100644 --- a/fluentui_calendar/src/main/AndroidManifest.xml +++ b/fluentui_calendar/src/main/AndroidManifest.xml @@ -1,5 +1,4 @@ - + \ No newline at end of file diff --git a/fluentui_ccb/build.gradle b/fluentui_ccb/build.gradle index 9475fdd3a..c04df9c32 100644 --- a/fluentui_ccb/build.gradle +++ b/fluentui_ccb/build.gradle @@ -13,8 +13,6 @@ android { defaultConfig { minSdkVersion constants.minSdkVersion targetSdkVersion constants.targetSdkVersion - versionCode project.ext.fluentui_ccb_version_code - versionName project.ext.fluentui_ccb_versionid testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' consumerProguardFiles 'consumer-rules.pro' } @@ -33,7 +31,8 @@ android { buildFeatures { compose true } - lintOptions { + namespace 'com.microsoft.fluentui.ccb' + lint { abortOnError false } } @@ -57,9 +56,9 @@ dependencies { implementation("androidx.constraintlayout:constraintlayout-compose:$constraintLayoutComposeVersion") } -task sourceJar(type: Jar) { +tasks.register('sourceJar', Jar) { from android.sourceSets.main.java.srcDirs - classifier "sources" + archiveClassifier.set("sources") } project.afterEvaluate { diff --git a/fluentui_ccb/src/main/AndroidManifest.xml b/fluentui_ccb/src/main/AndroidManifest.xml index 3c4ab5aaf..94cbbcfc3 100644 --- a/fluentui_ccb/src/main/AndroidManifest.xml +++ b/fluentui_ccb/src/main/AndroidManifest.xml @@ -1,2 +1 @@ - + diff --git a/fluentui_controls/build.gradle b/fluentui_controls/build.gradle index 41d94ea5d..684503713 100644 --- a/fluentui_controls/build.gradle +++ b/fluentui_controls/build.gradle @@ -9,13 +9,8 @@ android { defaultConfig { minSdkVersion constants.minSdkVersion targetSdkVersion constants.targetSdkVersion - versionCode project.ext.fluentui_controls_version_code - versionName project.ext.fluentui_controls_versionid testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' } - lintOptions { - abortOnError false - } buildTypes { release { minifyEnabled false @@ -42,6 +37,10 @@ android { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 } + namespace 'com.microsoft.fluentui.controls' + lint { + abortOnError false + } } dependencies { @@ -63,9 +62,9 @@ dependencies { androidTestImplementation "androidx.test.espresso:espresso-core:$espressoVersion" } -task sourceJar(type: Jar) { +tasks.register('sourceJar', Jar) { from android.sourceSets.main.java.srcDirs - classifier "sources" + archiveClassifier.set("sources") } project.afterEvaluate { diff --git a/fluentui_controls/src/main/AndroidManifest.xml b/fluentui_controls/src/main/AndroidManifest.xml index cad8a9bd4..25545c3bb 100644 --- a/fluentui_controls/src/main/AndroidManifest.xml +++ b/fluentui_controls/src/main/AndroidManifest.xml @@ -4,5 +4,4 @@ ~ Licensed under the MIT License. --> - \ No newline at end of file + \ No newline at end of file diff --git a/fluentui_core/build.gradle b/fluentui_core/build.gradle index 89293d399..ac1a53d85 100644 --- a/fluentui_core/build.gradle +++ b/fluentui_core/build.gradle @@ -15,8 +15,6 @@ android { defaultConfig { minSdkVersion constants.minSdkVersion targetSdkVersion constants.targetSdkVersion - versionCode project.ext.fluentui_core_version_code - versionName project.ext.fluentui_core_versionid testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' vectorDrawables.useSupportLibrary = true } @@ -48,10 +46,9 @@ android { } lint { baseline = file("lint-baseline.xml") - } - lintOptions { abortOnError false } + namespace 'com.microsoft.fluentui.core' } gradle.taskGraph.whenReady { taskGraph -> @@ -96,9 +93,9 @@ dependencies { implementation "androidx.compose.runtime:runtime-livedata" } -task sourceJar(type: Jar) { +tasks.register('sourceJar', Jar) { from android.sourceSets.main.java.srcDirs - classifier "sources" + archiveClassifier.set("sources") } project.afterEvaluate { diff --git a/fluentui_core/src/main/AndroidManifest.xml b/fluentui_core/src/main/AndroidManifest.xml index c353ba146..211ad8f09 100644 --- a/fluentui_core/src/main/AndroidManifest.xml +++ b/fluentui_core/src/main/AndroidManifest.xml @@ -3,5 +3,4 @@ ~ Copyright (c) Microsoft Corporation. All rights reserved. ~ Licensed under the MIT License. --> - + diff --git a/fluentui_drawer/build.gradle b/fluentui_drawer/build.gradle index abe58f744..44d6f60a6 100644 --- a/fluentui_drawer/build.gradle +++ b/fluentui_drawer/build.gradle @@ -17,8 +17,6 @@ android { defaultConfig { minSdkVersion constants.minSdkVersion targetSdkVersion constants.targetSdkVersion - versionCode project.ext.fluentui_drawer_version_code - versionName project.ext.fluentui_drawer_versionid testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' consumerProguardFiles 'consumer-rules.pro' } @@ -38,7 +36,8 @@ android { kotlinOptions { jvmTarget = '1.8' } - lintOptions { + namespace 'com.microsoft.fluentui.drawer' + lint { abortOnError false } } @@ -63,9 +62,9 @@ dependencies { implementation "androidx.constraintlayout:constraintlayout-compose:$constraintLayoutComposeVersion" } -task sourceJar(type: Jar) { +tasks.register('sourceJar', Jar) { from android.sourceSets.main.java.srcDirs - classifier "sources" + archiveClassifier.set("sources") } project.afterEvaluate { diff --git a/fluentui_drawer/src/main/AndroidManifest.xml b/fluentui_drawer/src/main/AndroidManifest.xml index 3e5684634..211ad8f09 100644 --- a/fluentui_drawer/src/main/AndroidManifest.xml +++ b/fluentui_drawer/src/main/AndroidManifest.xml @@ -3,5 +3,4 @@ ~ Copyright (c) Microsoft Corporation. All rights reserved. ~ Licensed under the MIT License. --> - + diff --git a/fluentui_icons/build.gradle b/fluentui_icons/build.gradle index 28bb09687..2ed90b31f 100644 --- a/fluentui_icons/build.gradle +++ b/fluentui_icons/build.gradle @@ -9,13 +9,8 @@ android { defaultConfig { minSdkVersion constants.minSdkVersion targetSdkVersion constants.targetSdkVersion - versionCode project.ext.fluentui_icons_version_code - versionName project.ext.fluentui_icons_versionid testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' } - lintOptions { - abortOnError false - } buildTypes { release { minifyEnabled false @@ -42,6 +37,10 @@ android { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 } + namespace 'com.microsoft.fluentui_icons' + lint { + abortOnError false + } } dependencies { @@ -55,9 +54,9 @@ dependencies { androidTestImplementation "androidx.test.espresso:espresso-core:$espressoVersion" } -task sourceJar(type: Jar) { +tasks.register('sourceJar', Jar) { from android.sourceSets.main.java.srcDirs - classifier "sources" + archiveClassifier.set("sources") } project.afterEvaluate { diff --git a/fluentui_icons/src/main/AndroidManifest.xml b/fluentui_icons/src/main/AndroidManifest.xml index efc985db5..44008a433 100644 --- a/fluentui_icons/src/main/AndroidManifest.xml +++ b/fluentui_icons/src/main/AndroidManifest.xml @@ -1,4 +1,4 @@ - + \ No newline at end of file diff --git a/fluentui_listitem/build.gradle b/fluentui_listitem/build.gradle index 89b9693fd..e434cfa1d 100644 --- a/fluentui_listitem/build.gradle +++ b/fluentui_listitem/build.gradle @@ -13,8 +13,6 @@ android { defaultConfig { minSdkVersion constants.minSdkVersion targetSdkVersion constants.targetSdkVersion - versionCode project.ext.fluentui_listitem_version_code - versionName project.ext.fluentui_listitem_versionid testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' consumerProguardFiles 'consumer-rules.pro' } @@ -37,7 +35,8 @@ android { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 } - lintOptions { + namespace 'com.microsoft.fluentui.listitem' + lint { abortOnError false } } @@ -59,9 +58,9 @@ dependencies { implementation "androidx.constraintlayout:constraintlayout-compose:$constraintLayoutComposeVersion" } -task sourceJar(type: Jar) { +tasks.register('sourceJar', Jar) { from android.sourceSets.main.java.srcDirs - classifier "sources" + archiveClassifier.set("sources") } project.afterEvaluate { diff --git a/fluentui_listitem/src/main/AndroidManifest.xml b/fluentui_listitem/src/main/AndroidManifest.xml index edc34759b..211ad8f09 100644 --- a/fluentui_listitem/src/main/AndroidManifest.xml +++ b/fluentui_listitem/src/main/AndroidManifest.xml @@ -3,5 +3,4 @@ ~ Copyright (c) Microsoft Corporation. All rights reserved. ~ Licensed under the MIT License. --> - + diff --git a/fluentui_menus/build.gradle b/fluentui_menus/build.gradle index cf6f0b9d8..2acdd21f5 100644 --- a/fluentui_menus/build.gradle +++ b/fluentui_menus/build.gradle @@ -13,8 +13,6 @@ android { defaultConfig { minSdkVersion constants.minSdkVersion targetSdkVersion constants.targetSdkVersion - versionCode project.ext.fluentui_menus_version_code - versionName project.ext.fluentui_menus_versionid testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' consumerProguardFiles 'consumer-rules.pro' } @@ -30,7 +28,8 @@ android { buildFeatures { compose true } - lintOptions { + namespace 'com.microsoft.fluentui.menus' + lint { abortOnError false } } @@ -50,9 +49,9 @@ dependencies { implementation("androidx.compose.ui:ui") } -task sourceJar(type: Jar) { +tasks.register('sourceJar', Jar) { from android.sourceSets.main.java.srcDirs - classifier "sources" + archiveClassifier.set("sources") } project.afterEvaluate { diff --git a/fluentui_menus/src/main/AndroidManifest.xml b/fluentui_menus/src/main/AndroidManifest.xml index 8ffaddaf1..498bc8944 100644 --- a/fluentui_menus/src/main/AndroidManifest.xml +++ b/fluentui_menus/src/main/AndroidManifest.xml @@ -3,7 +3,6 @@ ~ Copyright (c) Microsoft Corporation. All rights reserved. ~ Licensed under the MIT License. --> - + \ No newline at end of file diff --git a/fluentui_notification/build.gradle b/fluentui_notification/build.gradle index e86d09a21..a1dc66076 100644 --- a/fluentui_notification/build.gradle +++ b/fluentui_notification/build.gradle @@ -9,13 +9,8 @@ android { defaultConfig { minSdkVersion constants.minSdkVersion targetSdkVersion constants.targetSdkVersion - versionCode project.ext.fluentui_notification_version_code - versionName project.ext.fluentui_notification_versionid testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' } - lintOptions { - abortOnError false - } buildTypes { release { minifyEnabled false @@ -42,6 +37,10 @@ android { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 } + namespace 'com.microsoft.fluentui.notification' + lint { + abortOnError false + } } dependencies { @@ -64,9 +63,9 @@ dependencies { androidTestImplementation "androidx.test.espresso:espresso-core:$espressoVersion" } -task sourceJar(type: Jar) { +tasks.register('sourceJar', Jar) { from android.sourceSets.main.java.srcDirs - classifier "sources" + archiveClassifier.set("sources") } project.afterEvaluate { diff --git a/fluentui_notification/src/main/AndroidManifest.xml b/fluentui_notification/src/main/AndroidManifest.xml index 11d495868..25545c3bb 100644 --- a/fluentui_notification/src/main/AndroidManifest.xml +++ b/fluentui_notification/src/main/AndroidManifest.xml @@ -4,5 +4,4 @@ ~ Licensed under the MIT License. --> - \ No newline at end of file + \ No newline at end of file diff --git a/fluentui_others/build.gradle b/fluentui_others/build.gradle index cac516032..3b078b3f1 100644 --- a/fluentui_others/build.gradle +++ b/fluentui_others/build.gradle @@ -14,13 +14,8 @@ android { defaultConfig { minSdkVersion constants.minSdkVersion targetSdkVersion constants.targetSdkVersion - versionCode project.ext.fluentui_others_version_code - versionName project.ext.fluentui_others_versionid testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' } - lintOptions { - abortOnError false - } buildTypes { release { minifyEnabled false @@ -40,6 +35,10 @@ android { } productFlavors { } + namespace 'com.microsoft.fluentui' + lint { + abortOnError false + } } gradle.taskGraph.whenReady { taskGraph -> @@ -67,9 +66,9 @@ dependencies { androidTestImplementation "androidx.test.espresso:espresso-core:$espressoVersion" } -task sourceJar(type: Jar) { +tasks.register('sourceJar', Jar) { from android.sourceSets.main.java.srcDirs - classifier "sources" + archiveClassifier.set("sources") } project.afterEvaluate { diff --git a/fluentui_others/src/main/AndroidManifest.xml b/fluentui_others/src/main/AndroidManifest.xml index b0c12b398..a87e153ff 100644 --- a/fluentui_others/src/main/AndroidManifest.xml +++ b/fluentui_others/src/main/AndroidManifest.xml @@ -4,5 +4,4 @@ ~ Licensed under the MIT License. --> - + diff --git a/fluentui_peoplepicker/build.gradle b/fluentui_peoplepicker/build.gradle index 52dbd1117..16946122f 100644 --- a/fluentui_peoplepicker/build.gradle +++ b/fluentui_peoplepicker/build.gradle @@ -14,8 +14,6 @@ android { defaultConfig { minSdkVersion constants.minSdkVersion targetSdkVersion constants.targetSdkVersion - versionCode project.ext.fluentui_peoplepicker_version_code - versionName project.ext.fluentui_peoplepicker_versionid testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' vectorDrawables.useSupportLibrary = true } @@ -23,9 +21,6 @@ android { viewBinding true compose true } - lintOptions { - abortOnError false - } buildTypes { release { minifyEnabled false @@ -52,6 +47,10 @@ android { } productFlavors { } + namespace 'com.microsoft.fluentui.peoplepicker' + lint { + abortOnError false + } } gradle.taskGraph.whenReady { taskGraph -> @@ -83,9 +82,9 @@ dependencies { androidTestImplementation "androidx.test.espresso:espresso-core:$espressoVersion" } -task sourceJar(type: Jar) { +tasks.register('sourceJar', Jar) { from android.sourceSets.main.java.srcDirs - classifier "sources" + archiveClassifier.set("sources") } project.afterEvaluate { diff --git a/fluentui_peoplepicker/src/main/AndroidManifest.xml b/fluentui_peoplepicker/src/main/AndroidManifest.xml index 46e16c98a..a5918e68a 100644 --- a/fluentui_peoplepicker/src/main/AndroidManifest.xml +++ b/fluentui_peoplepicker/src/main/AndroidManifest.xml @@ -1,5 +1,4 @@ - + \ No newline at end of file diff --git a/fluentui_persona/build.gradle b/fluentui_persona/build.gradle index 97a409aaf..f52642da8 100644 --- a/fluentui_persona/build.gradle +++ b/fluentui_persona/build.gradle @@ -18,8 +18,6 @@ android { defaultConfig { minSdkVersion constants.minSdkVersion targetSdkVersion constants.targetSdkVersion - versionCode project.ext.fluentui_persona_version_code - versionName project.ext.fluentui_persona_versionid testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' consumerProguardFiles 'consumer-rules.pro' } @@ -59,7 +57,8 @@ android { } productFlavors { } - lintOptions { + namespace 'com.microsoft.fluentui.persona' + lint { abortOnError false } @@ -84,9 +83,9 @@ dependencies { implementation("androidx.compose.ui:ui") } -task sourceJar(type: Jar) { +tasks.register('sourceJar', Jar) { from android.sourceSets.main.java.srcDirs - classifier "sources" + archiveClassifier.set("sources") } project.afterEvaluate { diff --git a/fluentui_persona/src/main/AndroidManifest.xml b/fluentui_persona/src/main/AndroidManifest.xml index 2a9ccd87c..a5918e68a 100644 --- a/fluentui_persona/src/main/AndroidManifest.xml +++ b/fluentui_persona/src/main/AndroidManifest.xml @@ -1,5 +1,4 @@ - + \ No newline at end of file diff --git a/fluentui_progress/build.gradle b/fluentui_progress/build.gradle index 9bdb0b224..a046bcdf6 100644 --- a/fluentui_progress/build.gradle +++ b/fluentui_progress/build.gradle @@ -19,8 +19,6 @@ android { defaultConfig { minSdkVersion constants.minSdkVersion targetSdkVersion constants.targetSdkVersion - versionCode project.ext.fluentui_progress_version_code - versionName project.ext.fluentui_progress_versionid testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" vectorDrawables.useSupportLibrary = true consumerProguardFiles "consumer-rules.pro" @@ -34,12 +32,13 @@ android { kotlinOptions { jvmTarget = '1.8' } + namespace 'com.microsoft.fluentui.progress' + lint { + abortOnError false + } buildFeatures { compose true } - lintOptions { - abortOnError false - } } dependencies { @@ -58,9 +57,9 @@ dependencies { implementation("androidx.compose.ui:ui") } -task sourceJar(type: Jar) { +tasks.register('sourceJar', Jar) { from android.sourceSets.main.java.srcDirs - classifier "sources" + archiveClassifier.set("sources") } project.afterEvaluate { diff --git a/fluentui_progress/src/main/AndroidManifest.xml b/fluentui_progress/src/main/AndroidManifest.xml index a34602b5c..a5918e68a 100644 --- a/fluentui_progress/src/main/AndroidManifest.xml +++ b/fluentui_progress/src/main/AndroidManifest.xml @@ -1,5 +1,4 @@ - + \ No newline at end of file diff --git a/fluentui_tablayout/build.gradle b/fluentui_tablayout/build.gradle index b62186ccb..c4ebb5eeb 100644 --- a/fluentui_tablayout/build.gradle +++ b/fluentui_tablayout/build.gradle @@ -13,8 +13,6 @@ android { defaultConfig { minSdkVersion constants.minSdkVersion targetSdkVersion constants.targetSdkVersion - versionCode project.ext.fluentui_tablayout_version_code - versionName project.ext.fluentui_tablayout_versionid testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' consumerProguardFiles 'consumer-rules.pro' } @@ -33,7 +31,8 @@ android { composeOptions { kotlinCompilerExtensionVersion composeCompilerVersion } - lintOptions { + namespace 'com.microsoft.fluentui.tablayout' + lint { abortOnError false } } @@ -57,9 +56,9 @@ dependencies { androidTestImplementation "androidx.test.espresso:espresso-core:$espressoVersion" } -task sourceJar(type: Jar) { +tasks.register('sourceJar', Jar) { from android.sourceSets.main.java.srcDirs - classifier "sources" + archiveClassifier.set("sources") } project.afterEvaluate { diff --git a/fluentui_tablayout/src/main/AndroidManifest.xml b/fluentui_tablayout/src/main/AndroidManifest.xml index 61758d734..211ad8f09 100644 --- a/fluentui_tablayout/src/main/AndroidManifest.xml +++ b/fluentui_tablayout/src/main/AndroidManifest.xml @@ -3,5 +3,4 @@ ~ Copyright (c) Microsoft Corporation. All rights reserved. ~ Licensed under the MIT License. --> - + diff --git a/fluentui_topappbars/build.gradle b/fluentui_topappbars/build.gradle index 0a2fdef00..5ab84d76d 100644 --- a/fluentui_topappbars/build.gradle +++ b/fluentui_topappbars/build.gradle @@ -17,8 +17,6 @@ android { defaultConfig { minSdkVersion constants.minSdkVersion targetSdkVersion constants.targetSdkVersion - versionCode project.ext.fluentui_topappbars_version_code - versionName project.ext.fluentui_topappbars_versionid testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' consumerProguardFiles 'consumer-rules.pro' vectorDrawables.useSupportLibrary = true @@ -32,18 +30,22 @@ android { composeOptions { kotlinCompilerExtensionVersion composeCompilerVersion } + compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 - } - kotlinOptions { - jvmTarget = '1.8' + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } - lintOptions { + + namespace 'com.microsoft.fluentui.topappbars' + lint { abortOnError false } } +kotlin { + jvmToolchain(17) +} + dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) implementation project(':fluentui_core') @@ -63,9 +65,9 @@ dependencies { androidTestImplementation "androidx.test.espresso:espresso-core:$espressoVersion" } -task sourceJar(type: Jar) { +tasks.register('sourceJar', Jar) { from android.sourceSets.main.java.srcDirs - classifier "sources" + archiveClassifier.set("sources") } project.afterEvaluate { diff --git a/fluentui_topappbars/src/main/AndroidManifest.xml b/fluentui_topappbars/src/main/AndroidManifest.xml index b65804843..a5918e68a 100644 --- a/fluentui_topappbars/src/main/AndroidManifest.xml +++ b/fluentui_topappbars/src/main/AndroidManifest.xml @@ -1,5 +1,4 @@ - + \ No newline at end of file diff --git a/fluentui_transients/build.gradle b/fluentui_transients/build.gradle index 065d18d43..e6119aa3d 100644 --- a/fluentui_transients/build.gradle +++ b/fluentui_transients/build.gradle @@ -16,8 +16,6 @@ android { defaultConfig { minSdkVersion constants.minSdkVersion targetSdkVersion constants.targetSdkVersion - versionCode project.ext.fluentui_transients_version_code - versionName project.ext.fluentui_transients_versionid testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' consumerProguardFiles 'consumer-rules.pro' } @@ -27,9 +25,19 @@ android { proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } } - lintOptions { + namespace 'com.microsoft.fluentui.transients' + lint { abortOnError false } + + compileOptions { + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 + } +} + +kotlin { + jvmToolchain(17) } dependencies { @@ -42,11 +50,11 @@ dependencies { androidTestImplementation "androidx.test.espresso:espresso-core:$espressoVersion" } -task sourceJar(type: Jar) { +tasks.register('sourceJar', Jar) { from android.sourceSets.main.java.srcDirs - classifier "sources" + archiveClassifier.set("sources") } project.afterEvaluate { project.ext.publishingFunc('fluentui_transients') -} \ No newline at end of file +} diff --git a/fluentui_transients/src/main/AndroidManifest.xml b/fluentui_transients/src/main/AndroidManifest.xml index b4e38e70e..a5918e68a 100644 --- a/fluentui_transients/src/main/AndroidManifest.xml +++ b/fluentui_transients/src/main/AndroidManifest.xml @@ -1,5 +1,4 @@ - + \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 242dc1faf..ecc0fb933 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,3 +15,6 @@ android.enableJetifier=true android.useAndroidX=true android.jetifier.ignorelist=bcprov-jdk18on org.gradle.jvmargs=-XX\:MaxHeapSize\=256m -Dkotlin.daemon.jvm.options\="-Xmx2048M" -Xmx2048M +android.nonTransitiveRClass=false +android.defaults.buildfeatures.buildconfig=true +android.nonFinalResIds=false diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 9cd60ce6e..3e396fa74 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Tue Jul 25 14:53:36 IST 2023 distributionBase=GRADLE_USER_HOME -distributionUrl=https://services.gradle.org/distributions/gradle-7.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME From c0e1a97f9bf83b631c1995884348847a04d5520e Mon Sep 17 00:00:00 2001 From: Dhruv-Mishra Date: Tue, 26 Aug 2025 12:27:09 +0530 Subject: [PATCH 2/3] Updated JVM version --- FluentUI.Demo/build.gradle | 11 ++++++----- FluentUI/build.gradle | 8 ++++++++ fluentui_calendar/build.gradle | 8 ++++++++ fluentui_ccb/build.gradle | 9 +++++++-- fluentui_controls/build.gradle | 11 ++++++----- fluentui_core/build.gradle | 11 ++++++----- fluentui_drawer/build.gradle | 11 ++++++----- fluentui_icons/build.gradle | 11 ++++++----- fluentui_listitem/build.gradle | 11 ++++++----- fluentui_menus/build.gradle | 8 ++++++++ fluentui_notification/build.gradle | 11 ++++++----- fluentui_others/build.gradle | 8 ++++++++ fluentui_peoplepicker/build.gradle | 11 ++++++----- fluentui_persona/build.gradle | 11 ++++++----- fluentui_progress/build.gradle | 11 ++++++++--- fluentui_tablayout/build.gradle | 11 ++++++++--- 16 files changed, 109 insertions(+), 53 deletions(-) diff --git a/FluentUI.Demo/build.gradle b/FluentUI.Demo/build.gradle index ef40be99a..1535e0fd8 100644 --- a/FluentUI.Demo/build.gradle +++ b/FluentUI.Demo/build.gradle @@ -17,9 +17,6 @@ android { versionName '0.3.9' testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } - kotlinOptions { - jvmTarget = '1.8' - } buildFeatures { viewBinding true compose true @@ -28,8 +25,8 @@ android { kotlinCompilerExtensionVersion composeCompilerVersion } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } buildTypes { release { @@ -76,6 +73,10 @@ android { } } +kotlin { + jvmToolchain(17) +} + dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') implementation project(':FluentUI') diff --git a/FluentUI/build.gradle b/FluentUI/build.gradle index ccfa0ec13..38e652dd8 100644 --- a/FluentUI/build.gradle +++ b/FluentUI/build.gradle @@ -28,6 +28,10 @@ android { mavenCentral() } } + compileOptions { + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 + } lint { baseline = file("lint-baseline.xml") abortOnError false @@ -35,6 +39,10 @@ android { namespace 'com.microsoft.fluentui_container' } +kotlin { + jvmToolchain(17) +} + dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) api project(':fluentui_calendar') diff --git a/fluentui_calendar/build.gradle b/fluentui_calendar/build.gradle index 16c06058a..b1a3673be 100644 --- a/fluentui_calendar/build.gradle +++ b/fluentui_calendar/build.gradle @@ -26,6 +26,10 @@ android { proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } + compileOptions { + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 + } testOptions { unitTests { includeAndroidResources = true @@ -39,6 +43,10 @@ android { } } +kotlin { + jvmToolchain(17) +} + gradle.taskGraph.whenReady { taskGraph -> taskGraph.allTasks.forEach { if (it.name.contains("ReleaseUnitTest")) { diff --git a/fluentui_ccb/build.gradle b/fluentui_ccb/build.gradle index c04df9c32..48532d7fd 100644 --- a/fluentui_ccb/build.gradle +++ b/fluentui_ccb/build.gradle @@ -22,8 +22,9 @@ android { proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } } - kotlinOptions { - jvmTarget = '1.8' + compileOptions { + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } composeOptions { kotlinCompilerExtensionVersion composeCompilerVersion @@ -37,6 +38,10 @@ android { } } +kotlin { + jvmToolchain(17) +} + dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) implementation project(':fluentui_core') diff --git a/fluentui_controls/build.gradle b/fluentui_controls/build.gradle index 684503713..76898450b 100644 --- a/fluentui_controls/build.gradle +++ b/fluentui_controls/build.gradle @@ -24,9 +24,6 @@ android { } productFlavors { } - kotlinOptions { - jvmTarget = '1.8' - } buildFeatures { compose true } @@ -34,8 +31,8 @@ android { kotlinCompilerExtensionVersion composeCompilerVersion } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } namespace 'com.microsoft.fluentui.controls' lint { @@ -43,6 +40,10 @@ android { } } +kotlin { + jvmToolchain(17) +} + dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') implementation project(':fluentui_core') diff --git a/fluentui_core/build.gradle b/fluentui_core/build.gradle index ac1a53d85..3710393b9 100644 --- a/fluentui_core/build.gradle +++ b/fluentui_core/build.gradle @@ -31,11 +31,8 @@ android { kotlinCompilerExtensionVersion composeCompilerVersion } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 - } - kotlinOptions { - jvmTarget = '1.8' + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } testOptions { unitTests { @@ -51,6 +48,10 @@ android { namespace 'com.microsoft.fluentui.core' } +kotlin { + jvmToolchain(17) +} + gradle.taskGraph.whenReady { taskGraph -> taskGraph.allTasks.forEach { if (it.name.contains("ReleaseUnitTest")) { diff --git a/fluentui_drawer/build.gradle b/fluentui_drawer/build.gradle index 44d6f60a6..22f377e3b 100644 --- a/fluentui_drawer/build.gradle +++ b/fluentui_drawer/build.gradle @@ -30,11 +30,8 @@ android { kotlinCompilerExtensionVersion composeCompilerVersion } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 - } - kotlinOptions { - jvmTarget = '1.8' + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } namespace 'com.microsoft.fluentui.drawer' lint { @@ -42,6 +39,10 @@ android { } } +kotlin { + jvmToolchain(17) +} + dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) implementation project(':fluentui_core') diff --git a/fluentui_icons/build.gradle b/fluentui_icons/build.gradle index 2ed90b31f..8e66048f1 100644 --- a/fluentui_icons/build.gradle +++ b/fluentui_icons/build.gradle @@ -24,9 +24,6 @@ android { } productFlavors { } - kotlinOptions { - jvmTarget = '1.8' - } buildFeatures { compose true } @@ -34,8 +31,8 @@ android { kotlinCompilerExtensionVersion composeCompilerVersion } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } namespace 'com.microsoft.fluentui_icons' lint { @@ -43,6 +40,10 @@ android { } } +kotlin { + jvmToolchain(17) +} + dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') //Compose BOM diff --git a/fluentui_listitem/build.gradle b/fluentui_listitem/build.gradle index e434cfa1d..c1a8c3de1 100644 --- a/fluentui_listitem/build.gradle +++ b/fluentui_listitem/build.gradle @@ -22,9 +22,6 @@ android { proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } } - kotlinOptions { - jvmTarget = '1.8' - } buildFeatures { compose true } @@ -32,8 +29,8 @@ android { kotlinCompilerExtensionVersion composeCompilerVersion } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } namespace 'com.microsoft.fluentui.listitem' lint { @@ -41,6 +38,10 @@ android { } } +kotlin { + jvmToolchain(17) +} + dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) implementation project(':fluentui_core') diff --git a/fluentui_menus/build.gradle b/fluentui_menus/build.gradle index 2acdd21f5..99d7ec88d 100644 --- a/fluentui_menus/build.gradle +++ b/fluentui_menus/build.gradle @@ -25,6 +25,10 @@ android { composeOptions { kotlinCompilerExtensionVersion composeCompilerVersion } + compileOptions { + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 + } buildFeatures { compose true } @@ -34,6 +38,10 @@ android { } } +kotlin { + jvmToolchain(17) +} + dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) implementation project(':fluentui_core') diff --git a/fluentui_notification/build.gradle b/fluentui_notification/build.gradle index a1dc66076..211c8c5a8 100644 --- a/fluentui_notification/build.gradle +++ b/fluentui_notification/build.gradle @@ -24,9 +24,6 @@ android { } productFlavors { } - kotlinOptions { - jvmTarget = '1.8' - } buildFeatures { compose true } @@ -34,8 +31,8 @@ android { kotlinCompilerExtensionVersion composeCompilerVersion } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } namespace 'com.microsoft.fluentui.notification' lint { @@ -43,6 +40,10 @@ android { } } +kotlin { + jvmToolchain(17) +} + dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') implementation project(':fluentui_core') diff --git a/fluentui_others/build.gradle b/fluentui_others/build.gradle index 3b078b3f1..942211613 100644 --- a/fluentui_others/build.gradle +++ b/fluentui_others/build.gradle @@ -28,6 +28,10 @@ android { composeOptions { kotlinCompilerExtensionVersion composeCompilerVersion } + compileOptions { + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 + } testOptions { unitTests { includeAndroidResources = true @@ -41,6 +45,10 @@ android { } } +kotlin { + jvmToolchain(17) +} + gradle.taskGraph.whenReady { taskGraph -> taskGraph.allTasks.forEach { if (it.name.contains("ReleaseUnitTest")) { diff --git a/fluentui_peoplepicker/build.gradle b/fluentui_peoplepicker/build.gradle index 16946122f..4d9b15dd0 100644 --- a/fluentui_peoplepicker/build.gradle +++ b/fluentui_peoplepicker/build.gradle @@ -31,11 +31,8 @@ android { kotlinCompilerExtensionVersion composeCompilerVersion } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 - } - kotlinOptions { - jvmTarget = '1.8' + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } buildFeatures { compose true @@ -53,6 +50,10 @@ android { } } +kotlin { + jvmToolchain(17) +} + gradle.taskGraph.whenReady { taskGraph -> taskGraph.allTasks.forEach { if (it.name.contains("ReleaseUnitTest")) { diff --git a/fluentui_persona/build.gradle b/fluentui_persona/build.gradle index f52642da8..527f61bbb 100644 --- a/fluentui_persona/build.gradle +++ b/fluentui_persona/build.gradle @@ -44,11 +44,8 @@ android { kotlinCompilerExtensionVersion composeCompilerVersion } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 - } - kotlinOptions { - jvmTarget = '1.8' + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } testOptions { unitTests { @@ -64,6 +61,10 @@ android { } +kotlin { + jvmToolchain(17) +} + dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) implementation project(':fluentui_core') diff --git a/fluentui_progress/build.gradle b/fluentui_progress/build.gradle index a046bcdf6..900554a69 100644 --- a/fluentui_progress/build.gradle +++ b/fluentui_progress/build.gradle @@ -16,6 +16,10 @@ android { composeOptions { kotlinCompilerExtensionVersion composeCompilerVersion } + compileOptions { + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 + } defaultConfig { minSdkVersion constants.minSdkVersion targetSdkVersion constants.targetSdkVersion @@ -29,9 +33,6 @@ android { proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } } - kotlinOptions { - jvmTarget = '1.8' - } namespace 'com.microsoft.fluentui.progress' lint { abortOnError false @@ -41,6 +42,10 @@ android { } } +kotlin { + jvmToolchain(17) +} + dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) implementation project(':fluentui_core') diff --git a/fluentui_tablayout/build.gradle b/fluentui_tablayout/build.gradle index c4ebb5eeb..ebee46944 100644 --- a/fluentui_tablayout/build.gradle +++ b/fluentui_tablayout/build.gradle @@ -22,21 +22,26 @@ android { proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } } - kotlinOptions { - jvmTarget = '1.8' - } buildFeatures { compose true } composeOptions { kotlinCompilerExtensionVersion composeCompilerVersion } + compileOptions { + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 + } namespace 'com.microsoft.fluentui.tablayout' lint { abortOnError false } } +kotlin { + jvmToolchain(17) +} + dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) implementation project(':fluentui_core') From fcb1c7de34efd925d4b6c893970c2ed63828988a Mon Sep 17 00:00:00 2001 From: Dhruv-Mishra Date: Tue, 26 Aug 2025 12:34:17 +0530 Subject: [PATCH 3/3] Minor changes --- FluentUI.Demo/build.gradle | 16 ++++++++-------- FluentUI/build.gradle | 6 ++++-- fluentui_calendar/build.gradle | 7 ++++--- fluentui_ccb/build.gradle | 6 ++++-- fluentui_controls/build.gradle | 6 ++++-- fluentui_core/build.gradle | 9 +++++---- fluentui_drawer/build.gradle | 6 ++++-- fluentui_icons/build.gradle | 6 ++++-- fluentui_listitem/build.gradle | 6 ++++-- fluentui_menus/build.gradle | 6 ++++-- fluentui_notification/build.gradle | 6 ++++-- fluentui_others/build.gradle | 7 ++++--- fluentui_peoplepicker/build.gradle | 7 ++++--- fluentui_persona/build.gradle | 8 +++++--- fluentui_progress/build.gradle | 6 ++++-- fluentui_tablayout/build.gradle | 6 ++++-- fluentui_topappbars/build.gradle | 6 ++++-- fluentui_transients/build.gradle | 6 ++++-- 18 files changed, 78 insertions(+), 48 deletions(-) diff --git a/FluentUI.Demo/build.gradle b/FluentUI.Demo/build.gradle index 1535e0fd8..e247f2a84 100644 --- a/FluentUI.Demo/build.gradle +++ b/FluentUI.Demo/build.gradle @@ -2,10 +2,10 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. */ - -apply plugin: 'com.android.application' - -apply plugin: 'kotlin-android' +plugins { + id 'com.android.application' + id 'kotlin-android' +} android { compileSdkVersion constants.compileSdkVersion @@ -55,7 +55,7 @@ android { } } testOptions { - unitTests{ + unitTests { includeAndroidResources = true } unitTests.all { @@ -95,9 +95,9 @@ dependencies { //Compose BOM implementation platform("androidx.compose:compose-bom:$composeBomVersion") implementation "androidx.compose.ui:ui" - implementation ("androidx.compose.foundation:foundation-layout") - implementation ("androidx.compose.material:material") - implementation ("androidx.activity:activity-compose:$composeActivityVersion") + implementation("androidx.compose.foundation:foundation-layout") + implementation("androidx.compose.material:material") + implementation("androidx.activity:activity-compose:$composeActivityVersion") implementation "androidx.test.ext:junit-ktx:$junitKtxVersion" implementation "androidx.test.uiautomator:uiautomator:$uiautomatorVersion" androidTestImplementation("androidx.compose.ui:ui-test-junit4:$composeTestVersion") diff --git a/FluentUI/build.gradle b/FluentUI/build.gradle index 38e652dd8..5cc992000 100644 --- a/FluentUI/build.gradle +++ b/FluentUI/build.gradle @@ -2,8 +2,10 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. */ -apply plugin: 'com.android.library' -apply plugin: 'kotlin-android' +plugins { + id 'com.android.library' + id 'kotlin-android' +} apply from: '../config.gradle' apply from: '../publish.gradle' diff --git a/fluentui_calendar/build.gradle b/fluentui_calendar/build.gradle index b1a3673be..04194e9f2 100644 --- a/fluentui_calendar/build.gradle +++ b/fluentui_calendar/build.gradle @@ -2,9 +2,10 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. */ - -apply plugin: 'com.android.library' -apply plugin: 'kotlin-android' +plugins { + id 'com.android.library' + id 'kotlin-android' +} apply from: '../config.gradle' apply from: '../publish.gradle' diff --git a/fluentui_ccb/build.gradle b/fluentui_ccb/build.gradle index 48532d7fd..5c7032264 100644 --- a/fluentui_ccb/build.gradle +++ b/fluentui_ccb/build.gradle @@ -2,8 +2,10 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. */ -apply plugin: 'com.android.library' -apply plugin: 'kotlin-android' +plugins { + id 'com.android.library' + id 'kotlin-android' +} apply from: '../config.gradle' apply from: '../publish.gradle' diff --git a/fluentui_controls/build.gradle b/fluentui_controls/build.gradle index 76898450b..3dacd86e8 100644 --- a/fluentui_controls/build.gradle +++ b/fluentui_controls/build.gradle @@ -1,5 +1,7 @@ -apply plugin: 'com.android.library' -apply plugin: 'kotlin-android' +plugins { + id 'com.android.library' + id 'kotlin-android' +} apply from: '../config.gradle' apply from: '../publish.gradle' diff --git a/fluentui_core/build.gradle b/fluentui_core/build.gradle index 3710393b9..e1420c0ea 100644 --- a/fluentui_core/build.gradle +++ b/fluentui_core/build.gradle @@ -2,10 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. */ - -apply plugin: 'com.android.library' -apply plugin: 'kotlin-android' -apply plugin: 'kotlin-parcelize' +plugins { + id 'com.android.library' + id 'kotlin-android' + id 'kotlin-parcelize' +} apply from: '../config.gradle' apply from: '../publish.gradle' diff --git a/fluentui_drawer/build.gradle b/fluentui_drawer/build.gradle index 22f377e3b..a3642185f 100644 --- a/fluentui_drawer/build.gradle +++ b/fluentui_drawer/build.gradle @@ -2,8 +2,10 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. */ -apply plugin: 'com.android.library' -apply plugin: 'kotlin-android' +plugins { + id 'com.android.library' + id 'kotlin-android' +} apply from: '../config.gradle' apply from: '../publish.gradle' diff --git a/fluentui_icons/build.gradle b/fluentui_icons/build.gradle index 8e66048f1..11e314a63 100644 --- a/fluentui_icons/build.gradle +++ b/fluentui_icons/build.gradle @@ -1,5 +1,7 @@ -apply plugin: 'com.android.library' -apply plugin: 'kotlin-android' +plugins { + id 'com.android.library' + id 'kotlin-android' +} apply from: '../config.gradle' apply from: '../publish.gradle' diff --git a/fluentui_listitem/build.gradle b/fluentui_listitem/build.gradle index c1a8c3de1..06723cb0b 100644 --- a/fluentui_listitem/build.gradle +++ b/fluentui_listitem/build.gradle @@ -2,8 +2,10 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. */ -apply plugin: 'com.android.library' -apply plugin: 'kotlin-android' +plugins { + id 'com.android.library' + id 'kotlin-android' +} apply from: '../config.gradle' apply from: '../publish.gradle' diff --git a/fluentui_menus/build.gradle b/fluentui_menus/build.gradle index 99d7ec88d..36e951e93 100644 --- a/fluentui_menus/build.gradle +++ b/fluentui_menus/build.gradle @@ -2,8 +2,10 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. */ -apply plugin: 'com.android.library' -apply plugin: 'kotlin-android' +plugins { + id 'com.android.library' + id 'kotlin-android' +} apply from: '../config.gradle' apply from: '../publish.gradle' diff --git a/fluentui_notification/build.gradle b/fluentui_notification/build.gradle index 211c8c5a8..989fee2d6 100644 --- a/fluentui_notification/build.gradle +++ b/fluentui_notification/build.gradle @@ -1,5 +1,7 @@ -apply plugin: 'com.android.library' -apply plugin: 'kotlin-android' +plugins { + id 'com.android.library' + id 'kotlin-android' +} apply from: '../config.gradle' apply from: '../publish.gradle' diff --git a/fluentui_others/build.gradle b/fluentui_others/build.gradle index 942211613..153d37716 100644 --- a/fluentui_others/build.gradle +++ b/fluentui_others/build.gradle @@ -2,9 +2,10 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. */ - -apply plugin: 'com.android.library' -apply plugin: 'kotlin-android' +plugins { + id 'com.android.library' + id 'kotlin-android' +} apply from: '../config.gradle' apply from: '../publish.gradle' diff --git a/fluentui_peoplepicker/build.gradle b/fluentui_peoplepicker/build.gradle index 4d9b15dd0..b01a0067c 100644 --- a/fluentui_peoplepicker/build.gradle +++ b/fluentui_peoplepicker/build.gradle @@ -2,9 +2,10 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. */ - -apply plugin: 'com.android.library' -apply plugin: 'kotlin-android' +plugins { + id 'com.android.library' + id 'kotlin-android' +} apply from: '../config.gradle' apply from: '../publish.gradle' diff --git a/fluentui_persona/build.gradle b/fluentui_persona/build.gradle index 527f61bbb..2befda2c2 100644 --- a/fluentui_persona/build.gradle +++ b/fluentui_persona/build.gradle @@ -2,9 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. */ -apply plugin: 'com.android.library' -apply plugin: 'kotlin-android' -apply plugin: 'kotlin-parcelize' +plugins { + id 'com.android.library' + id 'kotlin-android' + id 'kotlin-parcelize' +} apply from: '../config.gradle' apply from: '../publish.gradle' diff --git a/fluentui_progress/build.gradle b/fluentui_progress/build.gradle index 900554a69..366e22e93 100644 --- a/fluentui_progress/build.gradle +++ b/fluentui_progress/build.gradle @@ -2,8 +2,10 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. */ -apply plugin: 'com.android.library' -apply plugin: 'kotlin-android' +plugins { + id 'com.android.library' + id 'kotlin-android' +} apply from: '../config.gradle' apply from: '../publish.gradle' diff --git a/fluentui_tablayout/build.gradle b/fluentui_tablayout/build.gradle index ebee46944..93f17e44b 100644 --- a/fluentui_tablayout/build.gradle +++ b/fluentui_tablayout/build.gradle @@ -2,8 +2,10 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. */ -apply plugin: 'com.android.library' -apply plugin: 'kotlin-android' +plugins { + id 'com.android.library' + id 'kotlin-android' +} apply from: '../config.gradle' apply from: '../publish.gradle' diff --git a/fluentui_topappbars/build.gradle b/fluentui_topappbars/build.gradle index 5ab84d76d..83c40dda7 100644 --- a/fluentui_topappbars/build.gradle +++ b/fluentui_topappbars/build.gradle @@ -2,8 +2,10 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. */ -apply plugin: 'com.android.library' -apply plugin: 'kotlin-android' +plugins { + id 'com.android.library' + id 'kotlin-android' +} apply from: '../config.gradle' apply from: '../publish.gradle' diff --git a/fluentui_transients/build.gradle b/fluentui_transients/build.gradle index e6119aa3d..0f778e446 100644 --- a/fluentui_transients/build.gradle +++ b/fluentui_transients/build.gradle @@ -2,8 +2,10 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. */ -apply plugin: 'com.android.library' -apply plugin: 'kotlin-android' +plugins { + id 'com.android.library' + id 'kotlin-android' +} apply from: '../config.gradle' apply from: '../publish.gradle'