Skip to content

Commit d2f000a

Browse files
committed
Merge branch 'dev' into release/v3
2 parents 019f895 + aa82643 commit d2f000a

26 files changed

+120
-76
lines changed

.github/dependabot.yml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,19 @@ updates:
55
schedule:
66
interval: daily
77
open-pull-requests-limit: 10
8+
groups:
9+
kiota-dependencies:
10+
patterns:
11+
- "*kiota*"
812
- package-ecosystem: gradle
913
directory: "/android"
1014
schedule:
1115
interval: daily
1216
open-pull-requests-limit: 10
17+
groups:
18+
kiota-dependencies:
19+
patterns:
20+
- "*kiota*"
1321
- package-ecosystem: gradle
1422
directory: "/samples/deviceCodeSample"
1523
schedule:
@@ -25,6 +33,10 @@ updates:
2533
schedule:
2634
interval: daily
2735
open-pull-requests-limit: 10
36+
groups:
37+
kiota-dependencies:
38+
patterns:
39+
- "*kiota*"
2840
- package-ecosystem: github-actions
2941
directory: "/"
3042
schedule:
@@ -36,18 +48,30 @@ updates:
3648
schedule:
3749
interval: daily
3850
open-pull-requests-limit: 10
51+
groups:
52+
kiota-dependencies:
53+
patterns:
54+
- "*kiota*"
3955
- package-ecosystem: gradle
4056
directory: "/android"
4157
target-branch: v3/longTermBranch
4258
schedule:
4359
interval: daily
4460
open-pull-requests-limit: 10
61+
groups:
62+
kiota-dependencies:
63+
patterns:
64+
- "*kiota*"
4565
- package-ecosystem: maven
4666
directory: "/"
4767
target-branch: v3/longTermBranch
4868
schedule:
4969
interval: daily
5070
open-pull-requests-limit: 10
71+
groups:
72+
kiota-dependencies:
73+
patterns:
74+
- "*kiota*"
5175
- package-ecosystem: github-actions
5276
directory: "/"
5377
target-branch: v3/longTermBranch

.github/workflows/api-level-lint.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@ jobs:
1616
runs-on: ubuntu-latest
1717
steps:
1818
- uses: actions/checkout@v4
19-
- uses: actions/setup-java@v3
19+
- uses: actions/setup-java@v4
2020
with:
2121
distribution: 'temurin'
2222
java-version: 20
2323
- name: Setup Android SDK
24-
uses: android-actions/setup-android@v3.0.0
24+
uses: android-actions/setup-android@v3.2.0
2525
- name: Add execution right to the script
2626
run: chmod +x gradlew
2727
working-directory: ./android
@@ -31,7 +31,7 @@ jobs:
3131
working-directory: ./android
3232
- name: Upload linting results
3333
if: failure() && steps.lint.outcome == 'failure'
34-
uses: actions/upload-artifact@v3
34+
uses: actions/upload-artifact@v4
3535
with:
3636
name: lint-report
3737
path: ./android/build/reports

.github/workflows/build-and-publish.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
- name: Easy detect-secrets
2525
uses: RobertFischer/[email protected]
2626
- name: Set up JDK
27-
uses: actions/setup-java@v3
27+
uses: actions/setup-java@v4
2828
with:
2929
java-version: 20
3030
distribution: 'temurin'
@@ -56,7 +56,7 @@ jobs:
5656
- name: Easy detect-secrets
5757
uses: RobertFischer/[email protected]
5858
- name: Set up JDK
59-
uses: actions/setup-java@v3
59+
uses: actions/setup-java@v4
6060
with:
6161
java-version: 20
6262
distribution: 'temurin'
@@ -78,7 +78,7 @@ jobs:
7878
- name: Publish
7979
run: ./gradlew $PUBLISH_TASK
8080
- name: Upload Build Artifact
81-
uses: actions/upload-artifact@v3
81+
uses: actions/upload-artifact@v4
8282
with:
8383
name: drop
8484
path: |
@@ -105,7 +105,7 @@ jobs:
105105
run: .\scripts\getLatestVersion.ps1
106106
shell: pwsh
107107
- name: Create tag
108-
uses: rickstaa/action-create-tag@v1.6.6
108+
uses: rickstaa/action-create-tag@v1.7.2
109109
with:
110110
tag: ${{ steps.GetVersion.outputs.tag }}
111111
- name: Queue Git Release

.github/workflows/codeql-analysis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,15 +45,15 @@ jobs:
4545
uses: actions/checkout@v4
4646

4747
- name: Set up JDK
48-
uses: actions/setup-java@v3
48+
uses: actions/setup-java@v4
4949
with:
5050
java-version: 20
5151
distribution: 'temurin'
5252
cache: gradle
5353

5454
# Initializes the CodeQL tools for scanning.
5555
- name: Initialize CodeQL
56-
uses: github/codeql-action/init@v2
56+
uses: github/codeql-action/init@v3
5757
with:
5858
languages: ${{ matrix.language }}
5959
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -81,6 +81,6 @@ jobs:
8181
run: ./gradlew build
8282

8383
- name: Perform CodeQL Analysis
84-
uses: github/codeql-action/analyze@v2
84+
uses: github/codeql-action/analyze@v3
8585
with:
8686
category: "/language:${{matrix.language}}"

.github/workflows/git-release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
steps:
1313
- uses: actions/checkout@v4
1414
- name: Download Build Artifact
15-
uses: dawidd6/action-download-artifact@v2.28.0
15+
uses: dawidd6/action-download-artifact@v3.0.0
1616
with:
1717
workflow: build-and-publish.yml
1818
workflow_conclusion: success
@@ -21,7 +21,7 @@ jobs:
2121
name: drop
2222
path: drop
2323
- name: Github Release
24-
uses: anton-yurchenko/git-release@v5.0
24+
uses: anton-yurchenko/git-release@v6.0
2525
env:
2626
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN}}
2727
DRAFT_RELEASE: "false"

.github/workflows/gradle-build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
steps:
1818
- uses: actions/checkout@v4
1919
- name: Set up JDK
20-
uses: actions/setup-java@v3
20+
uses: actions/setup-java@v4
2121
with:
2222
java-version: 20
2323
distribution: 'temurin'
@@ -29,7 +29,7 @@ jobs:
2929
- name: Build with Gradle
3030
run: ./gradlew build
3131
- name: Upload a Build Artifact
32-
uses: actions/upload-artifact@v3
32+
uses: actions/upload-artifact@v4
3333
with:
3434
name: drop
3535
path: |

.github/workflows/sample-build-check.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
runs-on: ubuntu-latest
1313
steps:
1414
- uses: actions/checkout@v4
15-
- uses: actions/setup-java@v3
15+
- uses: actions/setup-java@v4
1616
with:
1717
distribution: 'temurin'
1818
java-version: 20
@@ -26,7 +26,7 @@ jobs:
2626
runs-on: ubuntu-latest
2727
steps:
2828
- uses: actions/checkout@v4
29-
- uses: actions/setup-java@v3
29+
- uses: actions/setup-java@v4
3030
with:
3131
distribution: 'temurin'
3232
java-version: 20

.github/workflows/sonarcloud.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,19 +33,19 @@ jobs:
3333
with:
3434
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
3535
- name: Set up JDK
36-
uses: actions/setup-java@v3
36+
uses: actions/setup-java@v4
3737
with:
3838
java-version: 20
3939
distribution: 'temurin'
4040
cache: gradle
4141
- name: Cache SonarCloud packages
42-
uses: actions/cache@v3
42+
uses: actions/cache@v4
4343
with:
4444
path: ~/.sonar/cache
4545
key: ${{ runner.os }}-sonar
4646
restore-keys: ${{ runner.os }}-sonar
4747
- name: Cache Gradle packages
48-
uses: actions/cache@v3
48+
uses: actions/cache@v4
4949
with:
5050
path: ~/.gradle/caches
5151
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}

android/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ buildscript {
88
}
99

1010
dependencies {
11-
classpath "com.gradle:gradle-enterprise-gradle-plugin:3.15.1"
12-
classpath "com.android.tools.build:gradle:8.1.3"
13-
classpath "com.github.ben-manes:gradle-versions-plugin:0.49.0"
11+
classpath "com.gradle:gradle-enterprise-gradle-plugin:3.16.2"
12+
classpath "com.android.tools.build:gradle:8.2.2"
13+
classpath "com.github.ben-manes:gradle-versions-plugin:0.51.0"
1414
}
1515
}
1616

-18.2 KB
Binary file not shown.

0 commit comments

Comments
 (0)