Skip to content

Commit

Permalink
Merge branch 'main' into refactorInterpolation
Browse files Browse the repository at this point in the history
  • Loading branch information
braniii committed Mar 16, 2024
2 parents 956fb4a + 95bb210 commit 0a939e6
Show file tree
Hide file tree
Showing 8 changed files with 140 additions and 79 deletions.
15 changes: 15 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# Basic `dependabot.yml` file with
# minimum configuration for two package managers

version: 2
updates:
- package-ecosystem: "pub"
directory: "/app"
schedule:
interval: "weekly"

- package-ecosystem: "gradle"
directory: "/app/android"
schedule:
interval: "weekly"

16 changes: 14 additions & 2 deletions .github/workflows/build-flutter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: ⬇️ Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: ⚙️ Setup Java
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: "11.x"
cache: 'gradle'
Expand Down Expand Up @@ -56,3 +56,15 @@ jobs:
run: |
cd app
flutter build apk --split-per-abi --release
- name: Create Artifact Name
run: |
BRANCH_NAME="apks_${{ github.head_ref || github.ref_name }}"
export ARTIFACT_NAME="${BRANCH_NAME////\_}"
echo "ARTIFACT_NAME=$ARTIFACT_NAME" >> $GITHUB_ENV
- name: ⬆️ 📦 Upload apks
uses: actions/upload-artifact@v4
with:
name: "${{ env.ARTIFACT_NAME }}"
path: "app/build/app/outputs/flutter-apk/*.apk"
retention-days: 30
overwrite: true
4 changes: 2 additions & 2 deletions .github/workflows/flutter-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: ⬇️ Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: ⚙️ Setup Java
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: "11.x"
cache: 'gradle'
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
## [Unreleased]
### Added Features and Improvements 🙌:
- All new and improved interpolation API, the predictions are now more reliable
- Using the latest flutter 3.19 with upgraded deps
- Compile against Android 14 (SDK34)

### Bugfix 🐛:
- Fix bug, when reloading theme
Expand Down
4 changes: 2 additions & 2 deletions app/android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ if (keystorePropertiesFile.exists()) {
}

android {
compileSdkVersion 33
compileSdkVersion 34
ndkVersion "25.1.8937393"

sourceSets {
Expand All @@ -42,7 +42,7 @@ android {
defaultConfig {
applicationId "de.quantumphysique.trale"
minSdkVersion 19
targetSdkVersion 33
targetSdkVersion 34
versionCode flutterVersionCode.toInteger()
versionName flutterVersionName
externalNativeBuild {
Expand Down
2 changes: 1 addition & 1 deletion app/android/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
buildscript {
ext.kotlin_version = '1.9.10'
ext.kotlin_version = '1.9.23'
repositories {
google()
jcenter()
Expand Down
Loading

0 comments on commit 0a939e6

Please sign in to comment.