[Gradle] Gradle Version Upgrade

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
@@ -17,9 +17,6 @@ android {
         versionName '0.3.9'
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
-    kotlinOptions {
-        jvmTarget = '1.8'
-    }
     buildFeatures {
         viewBinding true
         compose true
@@ -28,12 +25,8 @@ android {
         kotlinCompilerExtensionVersion composeCompilerVersion
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-    lintOptions {
-        lintConfig = file("lint.xml")
-        abortOnError false
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
     buildTypes {
         release {
@@ -62,7 +55,7 @@ android {
         }
     }
     testOptions {
-        unitTests{
+        unitTests {
             includeAndroidResources = true
         }
         unitTests.all {
@@ -74,6 +67,14 @@ android {
             }
         }
     }
+    namespace 'com.microsoft.fluentuidemo'
+    lint {
+        abortOnError false
+    }
+}
+
+kotlin {
+    jvmToolchain(17)
 }
 
 dependencies {
@@ -94,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")

FluentUI.Demo/src/main/AndroidManifest.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.microsoft.fluentuidemo">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.INTERNET"/>
 

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'
@@ -13,8 +15,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'
 
@@ -30,12 +30,19 @@ android {
             mavenCentral()
         }
     }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
     lint {
         baseline = file("lint-baseline.xml")
-    }
-    lintOptions {
         abortOnError false
     }
+    namespace 'com.microsoft.fluentui_container'
+}
+
+kotlin {
+    jvmToolchain(17)
 }
 
 dependencies {
@@ -67,9 +74,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 {

FluentUI/src/main/AndroidManifest.xml

@@ -4,5 +4,4 @@
   ~ Licensed under the MIT License.
   -->
 <!-- TODO Change package name to com.microsoft.fluentui once modularization is complete -->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.microsoft.fluentui_container" />
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" />

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"

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'
@@ -14,30 +15,37 @@ 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
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
     testOptions {
         unitTests {
             includeAndroidResources = true
         }
     }
     productFlavors {
     }
+    namespace 'com.microsoft.fluentui.calendar'
+    lint {
+        abortOnError false
+    }
+}
+
+kotlin {
+    jvmToolchain(17)
 }
 
 gradle.taskGraph.whenReady { taskGraph ->
@@ -62,9 +70,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 {

fluentui_calendar/src/main/AndroidManifest.xml

@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.microsoft.fluentui.calendar">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
 </manifest>

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'
@@ -13,8 +15,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'
     }
@@ -24,20 +24,26 @@ 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
     }
     buildFeatures {
         compose true
     }
-    lintOptions {
+    namespace 'com.microsoft.fluentui.ccb'
+    lint {
         abortOnError false
     }
 }
 
+kotlin {
+    jvmToolchain(17)
+}
+
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation project(':fluentui_core')
@@ -57,9 +63,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 {

fluentui_ccb/src/main/AndroidManifest.xml

@@ -1,2 +1 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.microsoft.fluentui.ccb" />
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" />

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'
@@ -9,13 +11,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
@@ -29,19 +26,24 @@ android {
     }
     productFlavors {
     }
-    kotlinOptions {
-        jvmTarget = '1.8'
-    }
     buildFeatures {
         compose true
     }
     composeOptions {
         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 {
+        abortOnError false
+    }
+}
+
+kotlin {
+    jvmToolchain(17)
 }
 
 dependencies {
@@ -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 {

fluentui_controls/src/main/AndroidManifest.xml

@@ -4,5 +4,4 @@
   ~ Licensed under the MIT License.
   -->
 
-<manifest
-    package="com.microsoft.fluentui.controls" />
+<manifest />