Skip to content

Commit 2e46d61

Browse files
Merge pull request #1209 from session-foundation/release/1.25.0
1.25.0 to master
2 parents b03e8be + f388cf5 commit 2e46d61

File tree

758 files changed

+14827
-10884
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

758 files changed

+14827
-10884
lines changed

.drone.jsonnet

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ local ci_dep_mirror(want_mirror) = (if want_mirror then ' -DLOCAL_MIRROR=https:/
3939
environment: { ANDROID_HOME: '/usr/lib/android-sdk' },
4040
commands: [
4141
'apt-get update --allow-releaseinfo-change',
42-
'apt-get install -y ninja-build openjdk-17-jdk',
43-
'update-java-alternatives -s java-1.17.0-openjdk-amd64',
42+
'apt-get install -y ninja-build openjdk-21-jdk',
43+
'update-java-alternatives -s java-1.21.0-openjdk-amd64',
4444
'./gradlew testPlayDebugUnitTestCoverageReport'
4545
],
4646
}
@@ -81,10 +81,10 @@ local ci_dep_mirror(want_mirror) = (if want_mirror then ' -DLOCAL_MIRROR=https:/
8181
environment: { SSH_KEY: { from_secret: 'SSH_KEY' }, ANDROID_HOME: '/usr/lib/android-sdk' },
8282
commands: [
8383
'apt-get update --allow-releaseinfo-change',
84-
'apt-get install -y ninja-build openjdk-17-jdk',
85-
'update-java-alternatives -s java-1.17.0-openjdk-amd64',
86-
'./gradlew assemblePlayDebug assembleWebsiteDebug',
87-
'./gradlew -Phuawei=1 assembleHuaweiDebug',
84+
'apt-get install -y ninja-build openjdk-21-jdk',
85+
'update-java-alternatives -s java-1.21.0-openjdk-amd64',
86+
'./gradlew --no-daemon assemblePlayDebug assembleWebsiteDebug',
87+
'./gradlew --no-daemon -Phuawei=1 assembleHuaweiDebug',
8888
'./scripts/drone-static-upload.sh'
8989
],
9090
}

.github/dependabot.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: gradle
4+
directory: "/"
5+
schedule:
6+
interval: weekly
7+
8+
- package-ecosystem: github-actions
9+
directory: "/"
10+
schedule:
11+
interval: weekly

.github/workflows/build_and_test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,11 @@ jobs:
3636
- uses: actions/checkout@v4
3737
with:
3838
submodules: 'recursive'
39-
- name: Set up JDK 17
39+
- name: Set up JDK 21
4040
uses: actions/setup-java@v2
4141
with:
4242
distribution: 'temurin'
43-
java-version: '17'
43+
java-version: '21'
4444

4545
- name: Build and test with Gradle
4646
id: build

0 commit comments

Comments
 (0)