diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 91169682971..6001a9fed83 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -108,7 +108,7 @@ jobs: tag_name: v${{ env.FLOW_VERSION }} name: v${{ env.FLOW_VERSION }} token: ${{ secrets.CI_PAT }} - body_path: fastlane/metadata/android/en-US/changelogs/${{ env.FLOW_BUILD_NUMBER }}.txt + body_path: metadata/en-US/changelogs/${{ env.FLOW_BUILD_NUMBER }}.txt - name: Retag stable if: ${{ github.event.inputs.stable == 'true' || github.ref == 'refs/heads/main' }} run: | @@ -248,7 +248,7 @@ jobs: FLOW_BUILD_NUMBER="${BASH_REMATCH[2]}" echo "FLOW_BUILD_NUMBER=${FLOW_BUILD_NUMBER}" >> $GITHUB_ENV echo 'FLOW_CHANGELOG<> $GITHUB_ENV - cat fastlane/metadata/android/en-US/changelogs/${FLOW_BUILD_NUMBER}.txt >> $GITHUB_ENV + cat metadata/en-US/changelogs/${FLOW_BUILD_NUMBER}.txt >> $GITHUB_ENV echo '' >> $GITHUB_ENV echo 'EOF' >> $GITHUB_ENV - name: Discord Webhook Action diff --git a/app/android/app/build.gradle b/app/android/app/build.gradle index 91b6400120c..06f701ecc9f 100644 --- a/app/android/app/build.gradle +++ b/app/android/app/build.gradle @@ -34,7 +34,7 @@ apply plugin: 'kotlin-android' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { - compileSdk 33 + compileSdk flutter.compileSdkVersion ndkVersion flutter.ndkVersion compileOptions { diff --git a/app/android/build.gradle b/app/android/build.gradle index 54d8cf4d0a6..c38e64946db 100644 --- a/app/android/build.gradle +++ b/app/android/build.gradle @@ -6,7 +6,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:8.3.2' + classpath 'com.android.tools.build:gradle:8.4.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } diff --git a/app/android/gradle/wrapper/gradle-wrapper.properties b/app/android/gradle/wrapper/gradle-wrapper.properties index 2e9194e7a78..2ebea9a5998 100644 --- a/app/android/gradle/wrapper/gradle-wrapper.properties +++ b/app/android/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionSha256Sum=3e1af3ae886920c3ac87f7a91f816c0c7c436f276a6eefdb3da152100fef72ae +distributionSha256Sum=544c35d6bd849ae8a5ed0bcea39ba677dc40f49df7d1835561582da2009b961d diff --git a/metadata/dev.linwood.flow.nightly/en-US/title.txt b/metadata/dev.linwood.flow.nightly/en-US/title.txt new file mode 100644 index 00000000000..232b29e0fa8 --- /dev/null +++ b/metadata/dev.linwood.flow.nightly/en-US/title.txt @@ -0,0 +1 @@ +Linwood Flow Nightly \ No newline at end of file diff --git a/fastlane/metadata/android/en-US/title.txt b/metadata/dev.linwood.flow/en-US/title.txt similarity index 100% rename from fastlane/metadata/android/en-US/title.txt rename to metadata/dev.linwood.flow/en-US/title.txt diff --git a/fastlane/metadata/android/en-US/changelogs/1.txt b/metadata/en-US/changelogs/1.txt similarity index 100% rename from fastlane/metadata/android/en-US/changelogs/1.txt rename to metadata/en-US/changelogs/1.txt diff --git a/fastlane/metadata/android/en-US/changelogs/2.txt b/metadata/en-US/changelogs/2.txt similarity index 100% rename from fastlane/metadata/android/en-US/changelogs/2.txt rename to metadata/en-US/changelogs/2.txt diff --git a/fastlane/metadata/android/en-US/changelogs/3.txt b/metadata/en-US/changelogs/3.txt similarity index 100% rename from fastlane/metadata/android/en-US/changelogs/3.txt rename to metadata/en-US/changelogs/3.txt diff --git a/fastlane/metadata/android/en-US/changelogs/4.txt b/metadata/en-US/changelogs/4.txt similarity index 100% rename from fastlane/metadata/android/en-US/changelogs/4.txt rename to metadata/en-US/changelogs/4.txt diff --git a/fastlane/metadata/android/en-US/changelogs/5.txt b/metadata/en-US/changelogs/5.txt similarity index 100% rename from fastlane/metadata/android/en-US/changelogs/5.txt rename to metadata/en-US/changelogs/5.txt diff --git a/fastlane/metadata/android/en-US/changelogs/6.txt b/metadata/en-US/changelogs/6.txt similarity index 100% rename from fastlane/metadata/android/en-US/changelogs/6.txt rename to metadata/en-US/changelogs/6.txt diff --git a/fastlane/metadata/android/en-US/changelogs/7.txt b/metadata/en-US/changelogs/7.txt similarity index 94% rename from fastlane/metadata/android/en-US/changelogs/7.txt rename to metadata/en-US/changelogs/7.txt index 046e3ee8cd5..a63b49e7bd7 100644 --- a/fastlane/metadata/android/en-US/changelogs/7.txt +++ b/metadata/en-US/changelogs/7.txt @@ -12,9 +12,9 @@ * Improve dialogs to go full screen on mobile * Use default page transition instead of fade * Unify select dialogs -* Upgrade to flutter 3.19 * Fix locale translations * Fix week system in calendar week view * Fix switching from moment to appointment doesn't update the dialog +* Upgrade to flutter 3.19 and 3.22 Read more here: https://linwood.dev/flow/0.3 \ No newline at end of file diff --git a/fastlane/metadata/android/en-US/full_description.txt b/metadata/en-US/full_description.txt similarity index 100% rename from fastlane/metadata/android/en-US/full_description.txt rename to metadata/en-US/full_description.txt diff --git a/fastlane/metadata/android/en-US/images/featureGraphic.png b/metadata/en-US/images/featureGraphic.png similarity index 100% rename from fastlane/metadata/android/en-US/images/featureGraphic.png rename to metadata/en-US/images/featureGraphic.png diff --git a/fastlane/metadata/android/en-US/images/icon.png b/metadata/en-US/images/icon.png similarity index 100% rename from fastlane/metadata/android/en-US/images/icon.png rename to metadata/en-US/images/icon.png diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/appointment.png b/metadata/en-US/images/phoneScreenshots/appointment.png similarity index 100% rename from fastlane/metadata/android/en-US/images/phoneScreenshots/appointment.png rename to metadata/en-US/images/phoneScreenshots/appointment.png diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/list.png b/metadata/en-US/images/phoneScreenshots/list.png similarity index 100% rename from fastlane/metadata/android/en-US/images/phoneScreenshots/list.png rename to metadata/en-US/images/phoneScreenshots/list.png diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/month.png b/metadata/en-US/images/phoneScreenshots/month.png similarity index 100% rename from fastlane/metadata/android/en-US/images/phoneScreenshots/month.png rename to metadata/en-US/images/phoneScreenshots/month.png diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/notes.png b/metadata/en-US/images/phoneScreenshots/notes.png similarity index 100% rename from fastlane/metadata/android/en-US/images/phoneScreenshots/notes.png rename to metadata/en-US/images/phoneScreenshots/notes.png diff --git a/fastlane/metadata/android/en-US/images/sevenInchScreenshots/appointment.png b/metadata/en-US/images/sevenInchScreenshots/appointment.png similarity index 100% rename from fastlane/metadata/android/en-US/images/sevenInchScreenshots/appointment.png rename to metadata/en-US/images/sevenInchScreenshots/appointment.png diff --git a/fastlane/metadata/android/en-US/images/sevenInchScreenshots/list.png b/metadata/en-US/images/sevenInchScreenshots/list.png similarity index 100% rename from fastlane/metadata/android/en-US/images/sevenInchScreenshots/list.png rename to metadata/en-US/images/sevenInchScreenshots/list.png diff --git a/fastlane/metadata/android/en-US/images/sevenInchScreenshots/month.png b/metadata/en-US/images/sevenInchScreenshots/month.png similarity index 100% rename from fastlane/metadata/android/en-US/images/sevenInchScreenshots/month.png rename to metadata/en-US/images/sevenInchScreenshots/month.png diff --git a/fastlane/metadata/android/en-US/images/sevenInchScreenshots/notes.png b/metadata/en-US/images/sevenInchScreenshots/notes.png similarity index 100% rename from fastlane/metadata/android/en-US/images/sevenInchScreenshots/notes.png rename to metadata/en-US/images/sevenInchScreenshots/notes.png diff --git a/fastlane/metadata/android/en-US/images/tenInchScreenshots/appointment.png b/metadata/en-US/images/tenInchScreenshots/appointment.png similarity index 100% rename from fastlane/metadata/android/en-US/images/tenInchScreenshots/appointment.png rename to metadata/en-US/images/tenInchScreenshots/appointment.png diff --git a/fastlane/metadata/android/en-US/images/tenInchScreenshots/list.png b/metadata/en-US/images/tenInchScreenshots/list.png similarity index 100% rename from fastlane/metadata/android/en-US/images/tenInchScreenshots/list.png rename to metadata/en-US/images/tenInchScreenshots/list.png diff --git a/fastlane/metadata/android/en-US/images/tenInchScreenshots/month.png b/metadata/en-US/images/tenInchScreenshots/month.png similarity index 100% rename from fastlane/metadata/android/en-US/images/tenInchScreenshots/month.png rename to metadata/en-US/images/tenInchScreenshots/month.png diff --git a/fastlane/metadata/android/en-US/images/tenInchScreenshots/notes.png b/metadata/en-US/images/tenInchScreenshots/notes.png similarity index 100% rename from fastlane/metadata/android/en-US/images/tenInchScreenshots/notes.png rename to metadata/en-US/images/tenInchScreenshots/notes.png diff --git a/fastlane/metadata/android/en-US/short_description.txt b/metadata/en-US/short_description.txt similarity index 100% rename from fastlane/metadata/android/en-US/short_description.txt rename to metadata/en-US/short_description.txt diff --git a/tools/set_version.dart b/tools/set_version.dart index 7f6cc4ebec8..4a086f0c970 100644 --- a/tools/set_version.dart +++ b/tools/set_version.dart @@ -54,8 +54,7 @@ Future main(List args) async { await updateAppImageVersion(version); await updateDebianVersion(version); if (results['changelog']) { - var changelogFile = - File('fastlane/metadata/android/en-US/changelogs/$newBuildNumber.txt'); + var changelogFile = File('metadata/en-US/changelogs/$newBuildNumber.txt'); var changelog = await changelogFile.readAsString(); await updateChangelog(version, changelog); await updateAppData(version);