Merge branch 'main' into feat/automate-ossrh-release

.github/workflows/release.yml

@@ -52,6 +52,7 @@ jobs:
         Copy-Item secring.gpg components/serialization/json/ -Verbose
         Copy-Item secring.gpg components/serialization/multipart/ -Verbose
         Copy-Item secring.gpg components/http/okHttp/ -Verbose
+        Copy-Item secring.gpg components/bundle/ -Verbose
       shell: pwsh
     - name: Publish to local Maven cache
       run: ./gradlew --no-daemon publishToMavenLocal
@@ -118,6 +119,7 @@ jobs:
         Copy-Item secring.gpg components/serialization/json/ -Verbose
         Copy-Item secring.gpg components/serialization/multipart/ -Verbose
         Copy-Item secring.gpg components/http/okHttp/ -Verbose
+        Copy-Item secring.gpg components/bundle/ -Verbose
       shell: pwsh
     - name: Publish to local Maven cache for validation
       run: ./gradlew --no-daemon publishToMavenLocal
@@ -155,6 +157,8 @@ jobs:
       run: ./gradlew --no-daemon :components:authentication:azure:$PUBLISH_TASK -PmavenCentralSnapshotArtifactSuffix=""
     - name: Publish Release okHttp
       run: ./gradlew --no-daemon :components:http:okHttp:$PUBLISH_TASK -PmavenCentralSnapshotArtifactSuffix=""
+    - name: Publish Release bundle
+      run: ./gradlew --no-daemon :components:bundle:$PUBLISH_TASK -PmavenCentralSnapshotArtifactSuffix=""
     - name: Release
       uses: anton-yurchenko/[email protected]
       env:

CHANGELOG.md

@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [1.2.0] - 2024-07-25
+
+### Changed
+
+- Adds bundle package for Kiota [#1420](https://github.com/microsoft/kiota-java/issues/1420).
+
 ## [1.1.14] - 2024-06-10
 
 ### Changed

README.md

@@ -21,13 +21,14 @@ Read more about Kiota [here](https://github.com/microsoft/kiota/blob/main/README
 In `build.gradle` in the `dependencies` section:
 
 ```Groovy
-implementation 'com.microsoft.kiota:microsoft-kiota-abstractions:1.1.11'
-implementation 'com.microsoft.kiota:microsoft-kiota-authentication-azure:1.1.11'
-implementation 'com.microsoft.kiota:microsoft-kiota-http-okHttp:1.1.11'
-implementation 'com.microsoft.kiota:microsoft-kiota-serialization-json:1.1.11'
-implementation 'com.microsoft.kiota:microsoft-kiota-serialization-text:1.1.11'
-implementation 'com.microsoft.kiota:microsoft-kiota-serialization-form:1.1.11'
-implementation 'com.microsoft.kiota:microsoft-kiota-serialization-multipart:1.1.11'
+implementation 'com.microsoft.kiota:microsoft-kiota-abstractions:1.1.14'
+implementation 'com.microsoft.kiota:microsoft-kiota-authentication-azure:1.1.14'
+implementation 'com.microsoft.kiota:microsoft-kiota-http-okHttp:1.1.14'
+implementation 'com.microsoft.kiota:microsoft-kiota-serialization-json:1.1.14'
+implementation 'com.microsoft.kiota:microsoft-kiota-serialization-text:1.1.14'
+implementation 'com.microsoft.kiota:microsoft-kiota-serialization-form:1.1.14'
+implementation 'com.microsoft.kiota:microsoft-kiota-serialization-multipart:1.1.14'
+implementation 'jakarta.annotation:jakarta.annotation-api:2.1.1'
 ```
 
 ### With Maven:
@@ -38,37 +39,42 @@ In `pom.xml` in the `dependencies` section:
     <dependency>
       <groupId>com.microsoft.kiota</groupId>
       <artifactId>microsoft-kiota-abstractions</artifactId>
-      <version>1.1.11</version>
+      <version>1.1.14</version>
     </dependency>
     <dependency>
       <groupId>com.microsoft.kiota</groupId>
       <artifactId>microsoft-kiota-authentication-azure</artifactId>
-      <version>1.1.11</version>
+      <version>1.1.14</version>
     </dependency>
     <dependency>
       <groupId>com.microsoft.kiota</groupId>
       <artifactId>microsoft-kiota-http-okHttp</artifactId>
-      <version>1.1.11</version>
+      <version>1.1.14</version>
     </dependency>
     <dependency>
       <groupId>com.microsoft.kiota</groupId>
       <artifactId>microsoft-kiota-serialization-json</artifactId>
-      <version>1.1.11</version>
+      <version>1.1.14</version>
     </dependency>
     <dependency>
       <groupId>com.microsoft.kiota</groupId>
       <artifactId>microsoft-kiota-serialization-text</artifactId>
-      <version>1.1.11</version>
+      <version>1.1.14</version>
     </dependency>
     <dependency>
       <groupId>com.microsoft.kiota</groupId>
       <artifactId>microsoft-kiota-serialization-form</artifactId>
-      <version>1.1.11</version>
+      <version>1.1.14</version>
     </dependency>
     <dependency>
       <groupId>com.microsoft.kiota</groupId>
       <artifactId>microsoft-kiota-serialization-multipart</artifactId>
-      <version>1.1.11</version>
+      <version>1.1.14</version>
+    </dependency>
+    <dependency>
+      <groupId>jakarta.annotation</groupId>
+      <artifactId>jakarta.annotation-api</artifactId>
+      <version>2.1.1</version>
     </dependency>
 ```
 

components/abstractions/android/build.gradle

@@ -9,7 +9,7 @@ buildscript {
     }
 
     dependencies {
-        classpath "com.gradle:gradle-enterprise-gradle-plugin:3.17.5"
+        classpath "com.gradle:gradle-enterprise-gradle-plugin:3.17.6"
         classpath "com.android.tools.build:gradle:8.5.1"
         classpath "com.github.ben-manes:gradle-versions-plugin:0.51.0"
     }

components/abstractions/gradle/dependencies.gradle

@@ -8,7 +8,7 @@ dependencies {
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine'
 
     // This dependency is used internally, and not exposed to consumers on their own compile classpath.
-    implementation 'io.github.std-uritemplate:std-uritemplate:1.0.3'
+    implementation 'io.github.std-uritemplate:std-uritemplate:1.0.5'
     implementation 'io.opentelemetry:opentelemetry-api:1.40.0'
     implementation 'jakarta.annotation:jakarta.annotation-api:2.1.1'
 }

components/authentication/azure/android/build.gradle

@@ -9,7 +9,7 @@ buildscript {
     }
 
     dependencies {
-        classpath "com.gradle:gradle-enterprise-gradle-plugin:3.17.5"
+        classpath "com.gradle:gradle-enterprise-gradle-plugin:3.17.6"
         classpath "com.android.tools.build:gradle:8.5.1"
         classpath "com.github.ben-manes:gradle-versions-plugin:0.51.0"
     }

components/authentication/azure/gradle/dependencies.gradle

@@ -12,7 +12,7 @@ dependencies {
     implementation 'io.opentelemetry:opentelemetry-api:1.40.0'
     implementation 'io.opentelemetry:opentelemetry-context:1.40.0'
     implementation 'jakarta.annotation:jakarta.annotation-api:2.1.1'
-    api 'com.azure:azure-core:1.49.1'
+    api 'com.azure:azure-core:1.50.0'
 
     api project(':components:abstractions')
 }

components/bundle/.gitignore

@@ -0,0 +1,10 @@
+# Ignore Gradle project-specific cache directory
+.gradle
+
+# Ignore Gradle build output directory
+build
+
+
+.settings
+.project
+.classpath

components/bundle/android/.gitignore

@@ -0,0 +1,2 @@
+.gradle
+build

components/bundle/android/AndroidManifest.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:installLocation="auto"
+    tools:ignore="UnusedAttribute">
+
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+
+    <supports-screens
+        android:anyDensity="true"
+        android:largeScreens="true"
+        android:normalScreens="true"
+        android:smallScreens="true"
+        android:xlargeScreens="true" />
+
+    <application
+        android:hardwareAccelerated="true"
+        android:fullBackupContent="true"
+        android:allowBackup="true"
+        android:supportsRtl="true"
+        tools:ignore="GoogleAppIndexingWarning"></application>
+</manifest>

components/bundle/android/build.gradle

@@ -0,0 +1,73 @@
+buildscript {
+    repositories {
+        google()
+        gradlePluginPortal()
+        maven {
+            url "https://plugins.gradle.org/m2/"
+        }
+        maven { url 'https://oss.sonatype.org/content/repositories/snapshots' }
+    }
+
+    dependencies {
+        classpath "com.gradle:gradle-enterprise-gradle-plugin:3.17.5"
+        classpath "com.android.tools.build:gradle:8.5.1"
+        classpath "com.github.ben-manes:gradle-versions-plugin:0.51.0"
+    }
+}
+
+repositories {
+    google()
+    gradlePluginPortal()
+}
+
+apply plugin: "com.android.library"
+apply plugin: "com.github.ben-manes.versions"
+
+android {
+    namespace "com.microsoft.kiota.bundle"
+    compileSdkVersion 35
+
+    defaultConfig {
+        versionCode 1
+        versionName "1.0"
+        minSdkVersion 26
+        targetSdkVersion 35
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+        }
+    }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
+    lintOptions {
+        textOutput "stdout"
+        checkAllWarnings true
+        warningsAsErrors true
+        disable "UnusedResources"              // Unused will be removed on release
+        disable "IconExpectedSize"             // Using the material icons provided from Google
+        disable "GoogleAppIndexingApiWarning"  // We might want to index our app later
+        disable "InvalidPackage"               // Butterknife, Okio and Realm
+        disable "ResourceType"                 // Annotation binding
+        disable "GradleDependency"
+        disable "NewerVersionAvailable"
+        disable "DuplicatePlatformClasses"      // xpp3 added by azure-identity
+    }
+    sourceSets {
+        main {
+            java.srcDirs = ['../src/main/java']
+            res.srcDirs = ['../src/main/java']
+            manifest.srcFile 'AndroidManifest.xml'
+        }
+        androidTest {
+            setRoot '../src/test'
+        }
+    }
+}
+
+apply from: "../gradle/dependencies.gradle"

components/bundle/android/gradle.properties

@@ -0,0 +1 @@
+mavenArtifactId      = microsoft-kiota-bundle