Skip to content
This repository was archived by the owner on Dec 3, 2024. It is now read-only.

Commit 71f1a0d

Browse files
authored
Merge branch 'main' into fix/material-switch-style-padding
2 parents 96ac130 + 7e98855 commit 71f1a0d

File tree

7 files changed

+42
-40
lines changed

7 files changed

+42
-40
lines changed

.github/workflows/release-app.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,9 @@ jobs:
4545
echo '${{ secrets.SIGNING_KEYSTORE_JKS_BASE64 }}' | base64 -d > "$SYNCTHING_RELEASE_STORE_FILE"
4646
echo '${{ secrets.GOOGLE_PLAY_SECRETS_BASE64 }}' | base64 -d > "$SYNCTHING_RELEASE_PLAY_ACCOUNT_CONFIG_FILE"
4747
java -version
48-
./gradlew --no-daemon buildNative lint assembleRelease bundleRelease publishReleaseBundle
48+
# TODO: Readd publishReleaseBundle if google play works again, or
49+
# remove everything related to publishing to google play.
50+
./gradlew --no-daemon buildNative lint assembleRelease bundleRelease
4951
rm "$SYNCTHING_RELEASE_STORE_FILE" "$SYNCTHING_RELEASE_PLAY_ACCOUNT_CONFIG_FILE"
5052
5153
echo '${{ secrets.GNUPG_SIGNING_KEY_BASE64 }}' | base64 -d | gpg --import

app/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ android {
4444
applicationId = "com.nutomic.syncthingandroid"
4545
minSdk = 21
4646
targetSdk = 33
47-
versionCode = 4391
48-
versionName = "1.27.10"
47+
versionCode = 4393
48+
versionName = "1.27.12.1"
4949
testApplicationId = "com.nutomic.syncthingandroid.test"
5050
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
5151
}
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
* Update Syncthing to v1.27.10: https://github.com/syncthing/syncthing/releases/tag/v1.27.10
2-
* App changelog: https://github.com/syncthing/syncthing-android/releases/tag/1.27.10
1+
* Update Syncthing to v1.27.12: https://github.com/syncthing/syncthing/releases/tag/v1.27.12
2+
* App changelog: https://github.com/syncthing/syncthing-android/releases/tag/1.27.12
33

44
Still no releases on google play, see https://github.com/syncthing/syncthing-android/issues/2064

app/src/main/res/values-ru/strings.xml

Lines changed: 32 additions & 32 deletions
Large diffs are not rendered by default.

app/src/main/res/values-zh-rCN/strings.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -468,7 +468,7 @@
468468
<string name="state_error">错误</string>
469469
<string name="state_unknown">未知</string>
470470
<string name="state_paused">已暂停</string>
471-
<string name="status_outofsync">不同步</string>
471+
<string name="status_outofsync">未同步</string>
472472
<!--Format string for folder size, eg "500 MiB / 1 GiB"-->
473473
<string name="folder_size_format">%1$s / %2$s</string>
474474
<string name="appconfig_receiver_background_enabled">启用后台运行时,不支持停止 Syncthing。</string>

docker/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
FROM eclipse-temurin:11-jdk-jammy
22

3-
ENV GO_VERSION 1.22.1
3+
ENV GO_VERSION 1.22.7
44

55
# Can be found scrolling down on this page:
66
# https://developer.android.com/studio/index.html#command-tools
Submodule syncthing updated 87 files

0 commit comments

Comments
 (0)