Skip to content

Commit f5f4bd9

Browse files
axeluhlaxeluhl
committed
Merge branch 'main' into bug5959
2 parents 34183bf + 22ba5f8 commit f5f4bd9

File tree

320 files changed

+1315
-846
lines changed

Some content is hidden

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

320 files changed

+1315
-846
lines changed

‎.github/workflows/release.yml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ on:
66
- '.github/workflows/*'
77
- '**/*.md'
88
- 'README.md'
9+
- 'docs/**'
910
workflow_dispatch:
1011
inputs:
1112
skip_tests:
@@ -78,6 +79,12 @@ jobs:
7879
distribution: 'temurin' # See 'Supported distributions' for available options
7980
java-version: '8'
8081
mvn-toolchain-id: 'JavaSE-1.8'
82+
- name: Install JDK 17
83+
uses: actions/setup-java@v4
84+
with:
85+
distribution: 'temurin' # See 'Supported distributions' for available options
86+
java-version: '17'
87+
mvn-toolchain-id: 'JavaSE-17'
8188
- name: Install JDK 25
8289
uses: actions/setup-java@v4
8390
with:
@@ -107,6 +114,7 @@ jobs:
107114
GOOGLE_MAPS_AUTHENTICATION_PARAMS: ${{ secrets.GOOGLE_MAPS_AUTHENTICATION_PARAMS }}
108115
APP_PARAMETERS: "-Daws.region=eu-west-1"
109116
JAVA8_HOME: ${{env.JAVA_HOME_8_X64}}
117+
JAVA17_HOME: ${{env.JAVA_HOME_17_X64}}
110118
run: |
111119
./configuration/buildAndUpdateProduct.sh -x ${{ github.event.inputs.runner_cpus == '' && '4' || github.event.inputs.runner_cpus }} ${{ github.event.inputs.skip_tests == 'true' && '-t' || '' }} ${{ github.event.inputs.local_target_platform == 'true' && '-v' || '' }} build 2>&1
112120
- name: show disk stats

‎.pipeline/config.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@ steps:
2424
sapCumulusUpload:
2525
pipelineId: '84d219f0-1abb-4b37-bad0-e2893612ce25'
2626
versioningModel: 'semantic' # overwrite default from general section -> don't spam Cumulus
27+
sapCallStagingService:
28+
url: https://staging.repositories.cloud.sap/stage/api
29+
profile: 'naas-mobile-staging-profile'
2730
# Rotating vault secret if it is expring soon:
2831
vaultRotateSecretId:
2932
daysBeforeExpiry: 45

‎Gemfile.lock‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,26 +9,28 @@ GEM
99
public_suffix (>= 2.0.2, < 7.0)
1010
artifactory (3.0.17)
1111
atomos (0.1.3)
12-
aws-eventstream (1.3.2)
13-
aws-partitions (1.1091.0)
14-
aws-sdk-core (3.222.2)
12+
aws-eventstream (1.4.0)
13+
aws-partitions (1.1198.0)
14+
aws-sdk-core (3.240.0)
1515
aws-eventstream (~> 1, >= 1.3.0)
1616
aws-partitions (~> 1, >= 1.992.0)
1717
aws-sigv4 (~> 1.9)
1818
base64
19+
bigdecimal
1920
jmespath (~> 1, >= 1.6.1)
2021
logger
21-
aws-sdk-kms (1.99.0)
22-
aws-sdk-core (~> 3, >= 3.216.0)
22+
aws-sdk-kms (1.118.0)
23+
aws-sdk-core (~> 3, >= 3.239.1)
2324
aws-sigv4 (~> 1.5)
24-
aws-sdk-s3 (1.183.0)
25-
aws-sdk-core (~> 3, >= 3.216.0)
25+
aws-sdk-s3 (1.208.0)
26+
aws-sdk-core (~> 3, >= 3.234.0)
2627
aws-sdk-kms (~> 1)
2728
aws-sigv4 (~> 1.5)
28-
aws-sigv4 (1.11.0)
29+
aws-sigv4 (1.12.1)
2930
aws-eventstream (~> 1, >= 1.0.2)
3031
babosa (1.0.4)
31-
base64 (0.2.0)
32+
base64 (0.3.0)
33+
bigdecimal (4.0.1)
3234
claide (1.1.0)
3335
colored (1.2)
3436
colored2 (3.1.2)

‎README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,7 @@ export AWS_S3_TEST_S3ACCESSKEY={key-for-your-S3-token}
182182
export GEONAMES_ORG_USERNAMES={comma-separated-list-of-geonames.org-usernames}
183183
export GOOGLE_MAPS_AUTHENTICATION_PARAMS=key={your-Google-Maps-API-key}
184184
export JAVA8_HOME={location-of-your-JDK8}
185+
export JAVA17_HOME={location-of-your-JDK17}
185186
export JAVA_HOME={location-of-your-JDK17-or-newer}
186187
```
187188

‎azure-pipelines/main.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ resources:
2828
# For available versions, please have a look here (use the tag, not the release name):
2929
# https://github.tools.sap/SAPMobile/sap-mobile-pipeline/releases
3030
# ----------
31-
ref: 'refs/tags/3.12.0' # last version to support Android API Level 33
31+
ref: 'refs/tags/3.13.3'
3232

3333
#################################################################
3434
######################### Pipeline Start ########################
@@ -47,8 +47,8 @@ extends:
4747
testLaneName: 'test'
4848
# requestAuthentication: true # enable if fetching dependencies from Artifactory or Nexus
4949
appCenterSlug: 'sapsailing/sapsailing-android-apps'
50-
jdkVersion: 11
51-
androidVersion: 33
50+
jdkVersion: 17
51+
androidVersion: 35
5252
# We are building more than one app from our repository; we will use branches
5353
# to determine which app is to be built/released/signed
5454
# Default: Race Manager App

‎build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ buildscript {
1313
}
1414
}
1515
dependencies {
16-
classpath 'com.android.tools.build:gradle:3.6.4'
16+
classpath 'com.android.tools.build:gradle:7.0.4'
1717
classpath "org.ajoberstar:grgit:2.3.0"
1818
}
1919
}
@@ -64,7 +64,7 @@ ext {
6464

6565
// testing - jvm
6666
junit = "4.12"
67-
mockito = "1.9.5"
67+
mockito = "5.8.0"
6868

6969
// testing - ui
7070
test = "0.2"

‎cfg/VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.4.122
1+
1.4.124

‎configuration/buildAndUpdateProduct.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ fi
235235
rm $START_DIR/build.log
236236

237237
if [[ "$@" == "clean" ]]; then
238-
JAVA_HOME="${JAVA8_HOME}" ./gradlew clean
238+
JAVA_HOME="${JAVA17_HOME}" ./gradlew clean
239239
if [[ $? != 0 ]]; then
240240
exit 100
241241
fi
@@ -693,11 +693,11 @@ if [[ "$@" == "build" ]] || [[ "$@" == "all" ]]; then
693693
# mobile_extra="-P -with-not-android-relevant -P with-mobile"
694694

695695
echo "Building apps with Gradle..."
696-
JAVA_HOME="${JAVA8_HOME}" ./gradlew build
696+
JAVA_HOME="${JAVA17_HOME}" ./gradlew build
697697
if [[ ${PIPESTATUS[0]} != 0 ]]; then
698698
exit 100
699699
fi
700-
JAVA_HOME="${JAVA8_HOME}" ./gradlew assemble
700+
JAVA_HOME="${JAVA17_HOME}" ./gradlew assemble
701701
if [[ ${PIPESTATUS[0]} != 0 ]]; then
702702
exit 100
703703
fi

‎configuration/tractrac-json-urls‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -593,5 +593,6 @@ https://historical1.tractrac.com/events/event_20170603_SailingWor/jsonservice.ph
593593
https://liveserver1.tractrac.com/events/event_20240621_KielerWoch/jsonservice.php
594594
https://liveserver1.tractrac.com/events/event_20241003_ClubeNaval/jsonservice.php
595595
https://liveserver1.tractrac.com/events/event_20250210_HongKongRa/jsonservice.php
596+
https://liveserver1.tractrac.com/events/event_20251204_WorldSaili/jsonservice.php
596597
https://paris1.tractrac.com/events/event_20240312_TrofeoPrin/jsonservice.php
597598
https://paris1.tractrac.com/events/event_20240411_SemaineOly/jsonservice.php

‎docs/CNAME‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
docs.sapsailing.com

0 commit comments

Comments
 (0)