From f502e4c5acd57cf0a92f08f0f610f81418668740 Mon Sep 17 00:00:00 2001 From: thomassth Date: Fri, 2 Aug 2024 00:25:21 -0400 Subject: [PATCH 01/13] fix github actions --- .github/workflows/prerelease.yml | 22 +++++++++++++--------- .github/workflows/release.yml | 18 ++++++++++-------- 2 files changed, 23 insertions(+), 17 deletions(-) diff --git a/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml index b836df6a..e18606fd 100644 --- a/.github/workflows/prerelease.yml +++ b/.github/workflows/prerelease.yml @@ -36,15 +36,19 @@ jobs: run: | sed -i "0,/\#\# \[.*/s//## [${{steps.changelog_reader.outputs.version}}-$GITHUB_RUN_ID]/" CHANGELOG.md cat CHANGELOG.md - - name: Setup credentials - run: | - cat < $PUB_CACHE/credentials.json - ${{ secrets.CREDENTIALS }} - EOF - - name: Publish package - run: flutter pub publish --force + outputs: + version: ${{steps.changelog_reader.outputs.version}}-$GITHUB_RUN_ID + publish: + needs: prerelease + permissions: + id-token: write # Required for authentication using OIDC + uses: dart-lang/setup-dart/.github/workflows/publish.yml@v1 + entry: + needs: [prerelease, publish] + runs-on: ubuntu-latest + steps: - name: Add entry to Github release uses: softprops/action-gh-release@v1 with: - tag_name: ${{ steps.changelog_reader.outputs.version }}+${{ github.run_id }} - prerelease: true \ No newline at end of file + tag_name: ${{ needs.prerelease.outputs.version }} + prerelease: true diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 35967b42..db56afc7 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -25,13 +25,15 @@ jobs: channel: "stable" - run: dart --version - run: flutter --version - - name: Setup credentials - run: | - cat < $PUB_CACHE/credentials.json - ${{ secrets.CREDENTIALS }} - EOF - - name: Publish package - run: flutter pub publish --force + publish: + needs: release + permissions: + id-token: write # Required for authentication using OIDC + uses: dart-lang/setup-dart/.github/workflows/publish.yml@v1 + entry: + needs: [release, publish] + runs-on: ubuntu-latest + steps: - name: Get Changelog Entry id: changelog_reader uses: mindsers/changelog-reader-action@v2.0.0 @@ -39,4 +41,4 @@ jobs: uses: softprops/action-gh-release@v1 with: tag_name: ${{ steps.changelog_reader.outputs.version }} - body: ${{ steps.changelog_reader.outputs.changes }} \ No newline at end of file + body: ${{ steps.changelog_reader.outputs.changes }} From 6b9abbb102732cb733d1ae270afd179c53993e9d Mon Sep 17 00:00:00 2001 From: thomassth Date: Fri, 2 Aug 2024 01:08:03 -0400 Subject: [PATCH 02/13] another script --- .github/workflows/prerelease.yml | 39 +++++++++++++++++++------------- .github/workflows/release.yml | 36 ++++++++++++++++++----------- 2 files changed, 46 insertions(+), 29 deletions(-) diff --git a/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml index e18606fd..64e47e33 100644 --- a/.github/workflows/prerelease.yml +++ b/.github/workflows/prerelease.yml @@ -20,10 +20,8 @@ jobs: # Steps represent a sequence of tasks that will be executed as part of the job steps: # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - - uses: actions/checkout@v2 - - uses: subosito/flutter-action@v1 - with: - channel: "stable" + - uses: actions/checkout@v4 + - uses: subosito/flutter-action@v2 - run: dart --version - run: flutter --version - name: Edit pubspec.ymal for dev release @@ -36,19 +34,28 @@ jobs: run: | sed -i "0,/\#\# \[.*/s//## [${{steps.changelog_reader.outputs.version}}-$GITHUB_RUN_ID]/" CHANGELOG.md cat CHANGELOG.md - outputs: - version: ${{steps.changelog_reader.outputs.version}}-$GITHUB_RUN_ID - publish: - needs: prerelease - permissions: - id-token: write # Required for authentication using OIDC - uses: dart-lang/setup-dart/.github/workflows/publish.yml@v1 - entry: - needs: [prerelease, publish] - runs-on: ubuntu-latest - steps: + # copied from https://github.com/dart-lang/setup-dart/issues/68#issuecomment-2251116730 + - name: 🪪 Get Id Token + uses: actions/github-script@v6 + with: + script: | + let pub_token = await core.getIDToken('https://pub.dev') + github.rest.actions.createOrUpdateRepoSecret({ + owner: context.repo.owner, + repo: context.repo.repo, + secret_name: PUB_TOKEN, + encrypted_value: pub_token + }); + - name: 📢 Authenticate + run: flutter pub pub token add https://pub.dev --env-var ${{ secrets.PUB_TOKEN }} + - name: 📦 Install dependencies + run: flutter pub get + - name: 🌵 Dry Run + run: flutter pub publish --dry-run + - name: 📢 Publish + run: flutter pub publish -f - name: Add entry to Github release uses: softprops/action-gh-release@v1 with: - tag_name: ${{ needs.prerelease.outputs.version }} + tag_name: ${{steps.changelog_reader.outputs.version}}-$GITHUB_RUN_ID prerelease: true diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index db56afc7..39f89bc0 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -19,21 +19,31 @@ jobs: # Steps represent a sequence of tasks that will be executed as part of the job steps: # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - - uses: actions/checkout@v2 - - uses: subosito/flutter-action@v1 - with: - channel: "stable" + - uses: actions/checkout@v4 + # copied from https://github.com/dart-lang/setup-dart/issues/68#issuecomment-2251116730 + - uses: subosito/flutter-action@v2 - run: dart --version - run: flutter --version - publish: - needs: release - permissions: - id-token: write # Required for authentication using OIDC - uses: dart-lang/setup-dart/.github/workflows/publish.yml@v1 - entry: - needs: [release, publish] - runs-on: ubuntu-latest - steps: + - name: 🪪 Get Id Token + uses: actions/github-script@v6 + with: + script: | + let pub_token = await core.getIDToken('https://pub.dev') + let pub_token = await core.getIDToken('https://pub.dev') + github.rest.actions.createOrUpdateRepoSecret({ + owner: context.repo.owner, + repo: context.repo.repo, + secret_name: PUB_TOKEN, + encrypted_value: pub_token + }); + - name: 📢 Authenticate + run: flutter pub pub token add https://pub.dev --env-var ${{ secrets.PUB_TOKEN }} + - name: 📦 Install dependencies + run: flutter pub get + - name: 🌵 Dry Run + run: flutter pub publish --dry-run + - name: 📢 Publish + run: flutter pub publish -f - name: Get Changelog Entry id: changelog_reader uses: mindsers/changelog-reader-action@v2.0.0 From daf1103b0f1e0181db0d7c9e80ae66f886010ff7 Mon Sep 17 00:00:00 2001 From: thomassth Date: Fri, 2 Aug 2024 01:12:08 -0400 Subject: [PATCH 03/13] permissions --- .github/workflows/prerelease.yml | 2 ++ .github/workflows/release.yml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml index 64e47e33..214ff13f 100644 --- a/.github/workflows/prerelease.yml +++ b/.github/workflows/prerelease.yml @@ -18,6 +18,8 @@ jobs: # The type of runner that the job will run on runs-on: ubuntu-latest # Steps represent a sequence of tasks that will be executed as part of the job + permissions: + id-token: write steps: # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - uses: actions/checkout@v4 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 39f89bc0..529b51d8 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -16,6 +16,8 @@ jobs: release: # The type of runner that the job will run on runs-on: ubuntu-latest + permissions: + id-token: write # Steps represent a sequence of tasks that will be executed as part of the job steps: # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it From 78876f30de1515829f6c906eaef1f03144c51f7d Mon Sep 17 00:00:00 2001 From: thomassth Date: Fri, 2 Aug 2024 01:18:03 -0400 Subject: [PATCH 04/13] use env-var instead --- .github/workflows/prerelease.yml | 9 ++------- .github/workflows/release.yml | 10 ++-------- 2 files changed, 4 insertions(+), 15 deletions(-) diff --git a/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml index 214ff13f..c9e93d6b 100644 --- a/.github/workflows/prerelease.yml +++ b/.github/workflows/prerelease.yml @@ -42,14 +42,9 @@ jobs: with: script: | let pub_token = await core.getIDToken('https://pub.dev') - github.rest.actions.createOrUpdateRepoSecret({ - owner: context.repo.owner, - repo: context.repo.repo, - secret_name: PUB_TOKEN, - encrypted_value: pub_token - }); + core.exportVariable('PUB_TOKEN', pub_token) - name: 📢 Authenticate - run: flutter pub pub token add https://pub.dev --env-var ${{ secrets.PUB_TOKEN }} + run: flutter pub pub token add https://pub.dev --env-var PUB_TOKEN - name: 📦 Install dependencies run: flutter pub get - name: 🌵 Dry Run diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 529b51d8..36adda6a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -31,15 +31,9 @@ jobs: with: script: | let pub_token = await core.getIDToken('https://pub.dev') - let pub_token = await core.getIDToken('https://pub.dev') - github.rest.actions.createOrUpdateRepoSecret({ - owner: context.repo.owner, - repo: context.repo.repo, - secret_name: PUB_TOKEN, - encrypted_value: pub_token - }); + core.exportVariable('PUB_TOKEN', pub_token) - name: 📢 Authenticate - run: flutter pub pub token add https://pub.dev --env-var ${{ secrets.PUB_TOKEN }} + run: flutter pub pub token add https://pub.dev --env-var PUB_TOKEN - name: 📦 Install dependencies run: flutter pub get - name: 🌵 Dry Run From 400b3809ca3f4a7c5ae00397448ea03e329c13c8 Mon Sep 17 00:00:00 2001 From: thomassth Date: Fri, 2 Aug 2024 01:23:25 -0400 Subject: [PATCH 05/13] reposition keys --- .github/workflows/prerelease.yml | 6 +++--- .github/workflows/release.yml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml index c9e93d6b..04fa5383 100644 --- a/.github/workflows/prerelease.yml +++ b/.github/workflows/prerelease.yml @@ -43,14 +43,14 @@ jobs: script: | let pub_token = await core.getIDToken('https://pub.dev') core.exportVariable('PUB_TOKEN', pub_token) - - name: 📢 Authenticate - run: flutter pub pub token add https://pub.dev --env-var PUB_TOKEN - name: 📦 Install dependencies run: flutter pub get - name: 🌵 Dry Run run: flutter pub publish --dry-run - name: 📢 Publish - run: flutter pub publish -f + run: | + flutter pub pub token add https://pub.dev --env-var PUB_TOKEN + flutter pub publish -f - name: Add entry to Github release uses: softprops/action-gh-release@v1 with: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 36adda6a..52ec35ee 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -32,14 +32,14 @@ jobs: script: | let pub_token = await core.getIDToken('https://pub.dev') core.exportVariable('PUB_TOKEN', pub_token) - - name: 📢 Authenticate - run: flutter pub pub token add https://pub.dev --env-var PUB_TOKEN - name: 📦 Install dependencies run: flutter pub get - name: 🌵 Dry Run run: flutter pub publish --dry-run - name: 📢 Publish - run: flutter pub publish -f + run: | + flutter pub pub token add https://pub.dev --env-var PUB_TOKEN + flutter pub publish -f - name: Get Changelog Entry id: changelog_reader uses: mindsers/changelog-reader-action@v2.0.0 From 5a582191f89f9375a5517786e009113ee127f1c1 Mon Sep 17 00:00:00 2001 From: thomassth Date: Fri, 2 Aug 2024 02:20:42 -0400 Subject: [PATCH 06/13] typo --- .github/workflows/prerelease.yml | 2 +- .github/workflows/release.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml index 04fa5383..02ab612b 100644 --- a/.github/workflows/prerelease.yml +++ b/.github/workflows/prerelease.yml @@ -49,7 +49,7 @@ jobs: run: flutter pub publish --dry-run - name: 📢 Publish run: | - flutter pub pub token add https://pub.dev --env-var PUB_TOKEN + flutter pub token add https://pub.dev --env-var PUB_TOKEN flutter pub publish -f - name: Add entry to Github release uses: softprops/action-gh-release@v1 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 52ec35ee..1ba61e3e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -38,7 +38,7 @@ jobs: run: flutter pub publish --dry-run - name: 📢 Publish run: | - flutter pub pub token add https://pub.dev --env-var PUB_TOKEN + flutter pub token add https://pub.dev --env-var PUB_TOKEN flutter pub publish -f - name: Get Changelog Entry id: changelog_reader From 77c911007e5aee161f58b08e4424caace2796e75 Mon Sep 17 00:00:00 2001 From: thomassth Date: Fri, 2 Aug 2024 02:32:15 -0400 Subject: [PATCH 07/13] v4.3.3pre --- .github/workflows/prerelease.yml | 2 ++ .github/workflows/release.yml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml index 02ab612b..47e010eb 100644 --- a/.github/workflows/prerelease.yml +++ b/.github/workflows/prerelease.yml @@ -7,6 +7,8 @@ on: # Triggers the workflow on push or pull request events but only for the develop branch push: branches: [release, hotfix] + tags: + - "v[0-9]+.[0-9]+.[0-9]+*" # Allows you to run this workflow manually from the Actions tab workflow_dispatch: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1ba61e3e..7b260810 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -7,6 +7,8 @@ on: # Triggers the workflow on push or pull request events but only for the develop branch push: branches: [master] + tags: + - "v[0-9]+.[0-9]+.[0-9]+*" # Allows you to run this workflow manually from the Actions tab workflow_dispatch: From 6baa3535e664a67e2103e0ebcc9672df93708b17 Mon Sep 17 00:00:00 2001 From: thomassth Date: Fri, 2 Aug 2024 02:40:48 -0400 Subject: [PATCH 08/13] v4.3.3-20240801 --- .github/workflows/prerelease.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml index 47e010eb..c3806818 100644 --- a/.github/workflows/prerelease.yml +++ b/.github/workflows/prerelease.yml @@ -34,9 +34,15 @@ jobs: - name: Get Changelog Entry id: changelog_reader uses: mindsers/changelog-reader-action@v2.0.0 + - name: Get Git Tag + id: get_tag + run: echo "TAG=$(git describe --tags)" >> $GITHUB_ENV + + - name: Use Git Tag + run: echo "The tag is ${{ env.TAG }}" - name: Edit changelog.md for dev release run: | - sed -i "0,/\#\# \[.*/s//## [${{steps.changelog_reader.outputs.version}}-$GITHUB_RUN_ID]/" CHANGELOG.md + sed -i "0,/\#\# \[.*/s//## [${{env.TAG}}]/" CHANGELOG.md cat CHANGELOG.md # copied from https://github.com/dart-lang/setup-dart/issues/68#issuecomment-2251116730 - name: 🪪 Get Id Token @@ -56,5 +62,5 @@ jobs: - name: Add entry to Github release uses: softprops/action-gh-release@v1 with: - tag_name: ${{steps.changelog_reader.outputs.version}}-$GITHUB_RUN_ID + tag_name: ${{ env.TAG }} prerelease: true From f74687f83c440078827f19a6311d9a3b59169c8d Mon Sep 17 00:00:00 2001 From: thomassth Date: Fri, 2 Aug 2024 02:52:46 -0400 Subject: [PATCH 09/13] tag change --- .github/workflows/prerelease.yml | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml index c3806818..b81fff4e 100644 --- a/.github/workflows/prerelease.yml +++ b/.github/workflows/prerelease.yml @@ -8,7 +8,7 @@ on: push: branches: [release, hotfix] tags: - - "v[0-9]+.[0-9]+.[0-9]+*" + - "[0-9]+.[0-9]+.[0-9]+*" # Allows you to run this workflow manually from the Actions tab workflow_dispatch: @@ -28,18 +28,15 @@ jobs: - uses: subosito/flutter-action@v2 - run: dart --version - run: flutter --version + - name: Get Git Tag + id: get_tag + run: echo "TAG=$(git describe --tags)" >> $GITHUB_ENV - name: Edit pubspec.ymal for dev release run: | - sed -i "s/version.*/&-$GITHUB_RUN_ID/" pubspec.yaml + sed -i "s/version:.*/version: ${{ env.TAG }}/" pubspec.yaml - name: Get Changelog Entry id: changelog_reader uses: mindsers/changelog-reader-action@v2.0.0 - - name: Get Git Tag - id: get_tag - run: echo "TAG=$(git describe --tags)" >> $GITHUB_ENV - - - name: Use Git Tag - run: echo "The tag is ${{ env.TAG }}" - name: Edit changelog.md for dev release run: | sed -i "0,/\#\# \[.*/s//## [${{env.TAG}}]/" CHANGELOG.md From d5a6be8859073f04c8d29635be93047f626042cb Mon Sep 17 00:00:00 2001 From: Thomas Kam Date: Sun, 11 Aug 2024 16:20:10 -0400 Subject: [PATCH 10/13] fix pipeline runs --- example/lib/presentation/date_time_picker.dart | 2 +- example/lib/presentation/pages/calendar_event.dart | 11 +++++------ example/lib/presentation/pages/calendar_events.dart | 6 +++--- example/lib/presentation/pages/calendars.dart | 4 ++-- example/pubspec.yaml | 5 +++-- pubspec.yaml | 4 ++-- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/example/lib/presentation/date_time_picker.dart b/example/lib/presentation/date_time_picker.dart index dc11e8d9..449b82e8 100644 --- a/example/lib/presentation/date_time_picker.dart +++ b/example/lib/presentation/date_time_picker.dart @@ -45,7 +45,7 @@ class DateTimePicker extends StatelessWidget { @override Widget build(BuildContext context) { - final valueStyle = Theme.of(context).textTheme.headline6; + final valueStyle = Theme.of(context).textTheme.titleLarge; return Row( crossAxisAlignment: CrossAxisAlignment.end, children: [ diff --git a/example/lib/presentation/pages/calendar_event.dart b/example/lib/presentation/pages/calendar_event.dart index e834773b..89a17205 100644 --- a/example/lib/presentation/pages/calendar_event.dart +++ b/example/lib/presentation/pages/calendar_event.dart @@ -15,11 +15,12 @@ import 'event_reminders.dart'; enum RecurrenceRuleEndType { Indefinite, MaxOccurrences, SpecifiedEndDate } class CalendarEventPage extends StatefulWidget { - late final Calendar _calendar; + final Calendar _calendar; final Event? _event; final RecurringEventDialog? _recurringEventDialog; - CalendarEventPage(this._calendar, [this._event, this._recurringEventDialog]); + const CalendarEventPage(this._calendar, + [this._event, this._recurringEventDialog]); @override _CalendarEventPageState createState() { @@ -721,10 +722,8 @@ class _CalendarEventPageState extends State { _recurrenceFrequency) .data != null - ? Text(_recurrenceFrequencyToText( - _recurrenceFrequency) - .data! + - ' on the ') + ? Text( + '${_recurrenceFrequencyToText(_recurrenceFrequency).data!} on the ') : const Text('')), ), Padding( diff --git a/example/lib/presentation/pages/calendar_events.dart b/example/lib/presentation/pages/calendar_events.dart index 584458e3..38bd4946 100644 --- a/example/lib/presentation/pages/calendar_events.dart +++ b/example/lib/presentation/pages/calendar_events.dart @@ -156,11 +156,11 @@ class _CalendarEventsPageState extends State { builder: (BuildContext context) { return AlertDialog( title: const Text('Warning'), - content: SingleChildScrollView( + content: const SingleChildScrollView( child: ListBody( children: [ - const Text('This will delete this calendar'), - const Text('Are you sure?'), + Text('This will delete this calendar'), + Text('Are you sure?'), ], ), ), diff --git a/example/lib/presentation/pages/calendars.dart b/example/lib/presentation/pages/calendars.dart index 4dbf22e3..ab712805 100644 --- a/example/lib/presentation/pages/calendars.dart +++ b/example/lib/presentation/pages/calendars.dart @@ -46,7 +46,7 @@ class _CalendarsPageState extends State { padding: const EdgeInsets.all(10.0), child: Text( 'WARNING: some aspects of saving events are hardcoded in this example app. As such we recommend you do not modify existing events as this may result in loss of information', - style: Theme.of(context).textTheme.headline6, + style: Theme.of(context).textTheme.titleLarge, ), ), Expanded( @@ -77,7 +77,7 @@ class _CalendarsPageState extends State { Text( "${_calendars[index].id}: ${_calendars[index].name!}", style: - Theme.of(context).textTheme.subtitle1, + Theme.of(context).textTheme.titleMedium, ), Text( "Account: ${_calendars[index].accountName!}"), diff --git a/example/pubspec.yaml b/example/pubspec.yaml index 5b8b0fe0..6f41fb9b 100644 --- a/example/pubspec.yaml +++ b/example/pubspec.yaml @@ -4,7 +4,7 @@ version: 3.2.0 publish_to: none environment: - sdk: ">=2.12.0 <3.0.0" + sdk: ">=2.12.0 <4.0.0" dependencies: flutter: @@ -19,12 +19,13 @@ dependencies: device_calendar: path: ../ + collection: ^1.18.0 dev_dependencies: integration_test: sdk: flutter flutter_test: sdk: flutter - flutter_lints: ^2.0.1 + flutter_lints: ^4.0.0 # For information on the generic Dart part of this file, see the # following page: https://www.dartlang.org/tools/pub/pubspec diff --git a/pubspec.yaml b/pubspec.yaml index b2e16785..bcdbd014 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -13,7 +13,7 @@ dependencies: dev_dependencies: flutter_test: sdk: flutter - flutter_lints: ^2.0.1 + flutter_lints: ^4.0.0 # The following section is specific to Flutter. flutter: @@ -26,5 +26,5 @@ flutter: pluginClass: DeviceCalendarPlugin environment: - sdk: ">=2.12.0 <3.0.0" + sdk: ">=2.12.0 <4.0.0" flutter: ">=1.12.13" From 3f4ec486b71c56f40a03e4c23e04ca070d520748 Mon Sep 17 00:00:00 2001 From: Thomas Kam Date: Sun, 11 Aug 2024 16:22:44 -0400 Subject: [PATCH 11/13] remove broken job --- .github/workflows/prerelease.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml index b81fff4e..cbe13b2c 100644 --- a/.github/workflows/prerelease.yml +++ b/.github/workflows/prerelease.yml @@ -56,8 +56,3 @@ jobs: run: | flutter pub token add https://pub.dev --env-var PUB_TOKEN flutter pub publish -f - - name: Add entry to Github release - uses: softprops/action-gh-release@v1 - with: - tag_name: ${{ env.TAG }} - prerelease: true From 967374368b416789ce8a33812105a0b920aafcf8 Mon Sep 17 00:00:00 2001 From: Thomas Kam Date: Sun, 11 Aug 2024 16:24:37 -0400 Subject: [PATCH 12/13] update kotlin versions --- android/build.gradle | 2 +- example/android/build.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index 584dc4ae..69a02211 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -2,7 +2,7 @@ group 'com.builttoroam.devicecalendar' version '1.0-SNAPSHOT' buildscript { - ext.kotlin_version = '1.6.0' + ext.kotlin_version = '1.7.0' repositories { google() mavenCentral() diff --git a/example/android/build.gradle b/example/android/build.gradle index d3f65307..a1fd6e7f 100644 --- a/example/android/build.gradle +++ b/example/android/build.gradle @@ -1,5 +1,5 @@ buildscript { - ext.kotlin_version = '1.6.0' + ext.kotlin_version = '1.7.0' repositories { google() mavenCentral() From 8cd4161bc5ece4ebbfb09f009cade8a08946aead Mon Sep 17 00:00:00 2001 From: Thomas Kam Date: Sun, 11 Aug 2024 16:29:42 -0400 Subject: [PATCH 13/13] update kotlin versions --- android/build.gradle | 4 ++-- example/android/app/build.gradle | 2 +- example/android/build.gradle | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index 69a02211..76ab5ef2 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -2,7 +2,7 @@ group 'com.builttoroam.devicecalendar' version '1.0-SNAPSHOT' buildscript { - ext.kotlin_version = '1.7.0' + ext.kotlin_version = '1.7.10' repositories { google() mavenCentral() @@ -25,7 +25,7 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' android { - compileSdkVersion 33 + compileSdkVersion 34 sourceSets { main.java.srcDirs += 'src/main/kotlin' diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle index 11cc8cb1..3b531cd0 100644 --- a/example/android/app/build.gradle +++ b/example/android/app/build.gradle @@ -16,7 +16,7 @@ apply plugin: 'kotlin-android' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { - compileSdkVersion 33 + compileSdkVersion 34 ndkVersion '22.1.7171670' sourceSets { diff --git a/example/android/build.gradle b/example/android/build.gradle index a1fd6e7f..d1b666ac 100644 --- a/example/android/build.gradle +++ b/example/android/build.gradle @@ -1,5 +1,5 @@ buildscript { - ext.kotlin_version = '1.7.0' + ext.kotlin_version = '1.7.10' repositories { google() mavenCentral()