Skip to content

Commit 1102614

Browse files
Merge branch 'develop' into 1385-feature-allow-saving-all-settings
2 parents 90ece4e + e12ed7f commit 1102614

File tree

82 files changed

+3898
-1376
lines changed

Some content is hidden

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

82 files changed

+3898
-1376
lines changed

Diff for: .github/workflows/create-beta.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
run: cp app/build/outputs/apk/ose/release/app-ose-release.apk jtxBoard-${{ github.ref_name }}.apk
5454

5555
- name: Create Github release
56-
uses: softprops/action-gh-release@v2.0.8
56+
uses: softprops/action-gh-release@v2.2.1
5757
with:
5858
prerelease: ${{ contains(github.ref_name, '-alpha') || contains(github.ref_name, '-beta') || contains(github.ref_name, '-rc') }}
5959
files: |

Diff for: .github/workflows/create-release.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ jobs:
6666
run: cp app/build/outputs/apk/ose/release/app-ose-release.apk jtxBoard-${{ github.ref_name }}.apk
6767

6868
- name: Create Github release
69-
uses: softprops/action-gh-release@v2.0.8
69+
uses: softprops/action-gh-release@v2.2.1
7070
with:
7171
prerelease: ${{ contains(github.ref_name, '-alpha') || contains(github.ref_name, '-beta') || contains(github.ref_name, '-rc') }}
7272
files: |

Diff for: app/build.gradle.kts

+5-5
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,14 @@ plugins {
2323

2424
android {
2525
namespace = "at.techbee.jtx"
26-
compileSdk = 34
26+
compileSdk = 35
2727
defaultConfig {
2828
applicationId = "at.techbee.jtx"
2929
buildConfigField("long", "buildTime", "${System.currentTimeMillis()}L")
3030
minSdk = 23
31-
targetSdk = 34
32-
versionCode = 209020002
33-
versionName = "2.09.02-beta01" // keep -release as a suffix also for release, build flavor adds the suffix e.g. .gplay (e.g. 1.00.00-rc0.gplay)
31+
targetSdk = 35
32+
versionCode = 210010010
33+
versionName = "2.10.01-beta01" // keep -release as a suffix also for release, build flavor adds the suffix e.g. .gplay (e.g. 1.00.00-rc0.gplay)
3434
buildConfigField("String", "versionCodename", "\"Pride is a protest \uD83C\uDF08\"")
3535
multiDexEnabled = true
3636
vectorDrawables.useSupportLibrary = true
@@ -210,7 +210,7 @@ dependencies {
210210

211211
// third-party libs
212212
implementation(libs.mikepenz.aboutLibraries)
213-
implementation(libs.godaddy.colorpicker) // Compose Color Picker
213+
implementation(libs.colorpicker.compose) // Compose Color Picker
214214
implementation(libs.markdowntext) // Markdown support
215215
implementation(libs.osmdroid.android) //Open Street Maps
216216
implementation (libs.calendar.compose)

0 commit comments

Comments
 (0)