Build Pipelines

azure-pipelines.yml

@@ -0,0 +1,187 @@
+# Starter pipeline
+# Start with a minimal pipeline that you can customize to build and deploy your code.
+# Add steps that build, run tests, deploy, and more:
+# https://aka.ms/yaml
+
+variables:
+  # The $(FlutterToolPath) variable is generated by the FlutterInstall task 
+  # See code in the Flutter Build task https://github.com/aloisdeniel/vsts-flutter-tasks/blob/master/tasks/build/index.ts
+  flutterExecPath: $(FlutterToolPath)/flutter.bat
+  versionNumberRegex: '(?<=version: ).*'
+
+trigger:
+  batch: 'true'
+  branches:
+    include:
+      - develop
+      - release
+      - hotfix
+      - master
+  paths:
+    include:
+      - device_calendar/*
+
+stages:
+  # ----------- CI -----------
+  - stage: Build
+    jobs: 
+     - job: BuildAndroidAndIos
+       pool:
+        vmImage: 'macOS-latest'
+       steps:
+        - task: FlutterInstall@0
+          displayName: 'Flutter install'
+          inputs:
+            channel: 'stable'
+            version: 'latest'
+
+        - task: FlutterBuild@0
+          displayName: 'Flutter build - Android'
+          inputs:
+            target: 'aab'
+            projectDirectory: 'device_calendar/example'
+
+        - task: FlutterBuild@0
+          displayName: 'Flutter build - iOS'
+          inputs:
+            target: 'ios'
+            projectDirectory: 'device_calendar/example'
+            iosCodesign: false
+
+  # -----------CD Pre-release -----------
+  - stage: DevelopmentRelease
+    dependsOn: Build
+    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'ref/release'), eq(variables['Build.SourceBranch'], 'refs/hotfix'))
+    jobs:
+     - job: ReleaseDevelopmentVersion
+       pool:
+        vmImage: 'windows-latest'
+       steps:
+        - task: FlutterInstall@0
+          displayName: 'Flutter install'
+          inputs:
+            channel: 'stable'
+            version: 'latest'
+
+        - task: PowerShell@2
+          condition: eq(variables['Build.SourceBranch'], 'ref/release')
+          displayName: 'Pre-release versioning - pubspec.yaml'
+          inputs:
+            targetType: 'inline'
+            script: |
+              [string] $version = select-string -path "$(Build.SourcesDirectory)/device_calendar/pubspec.yaml" -pattern "$(versionGetRegex)" | %{ $_.Matches[0].Value }
+              Write-Host "##vso[task.setvariable variable=currentVersion]$version"
+
+              [string] $pubspecContent = Get-Content -Path "$(Build.SourcesDirectory)/device_calendar/pubspec.yaml" -Raw
+
+              Write-Host " (i) Current version: $version"
+              Write-Host " (i) Original pubspec.yaml content: $pubspecContent"
+
+              [string] $newPubspecContent = $pubspecContent -replace $version, "$version-dev.$(Build.BuildID)"
+
+              Write-Host " (i) Updated pubspec.yaml content: $newPubspecContent"
+
+              $newPubspecContent | Set-Content -Path "$(Build.SourcesDirectory)/device_calendar/pubspec.yaml"
+
+        - task: PowerShell@2
+          condition: eq(variables['Build.SourceBranch'], 'ref/release')
+          displayName: 'Pre-release versioning - CHANGELOG.md'
+          inputs:
+            targetType: 'inline'
+            script: |
+              [string] $changelogContent = Get-Content -Path "$(Build.SourcesDirectory)/device_calendar/CHANGELOG.md" -Raw
+
+              Write-Host " (i) Current version: $env.currentVersion"
+              Write-Host " (i) Original CHANGELOG.md content: $changelogContent"
+
+              [string] $newChangelogContent = $changelogContent -replace $env:currentVersion, "$env:currentVersion-dev.$(Build.BuildID)"
+
+              Write-Host " (i) Updated CHANGELOG.md content: $newChangelogContent"
+
+              $newChangelogContent | Set-Content -Path "$(Build.SourcesDirectory)/device_calendar/CHANGELOG.md"
+
+        - task: CmdLine@2
+          displayName: 'Dry run publish'
+          inputs:
+            workingDirectory: '$(Build.SourcesDirectory)/device_calendar'
+            script: '$(flutterExecPath) pub publish --dry-run'
+
+        - task: CmdLine@2
+          condition: eq(variables['Build.SourceBranch'], 'ref/release')
+          displayName: 'Publish'
+          inputs:
+            workingDirectory: '$(Build.SourcesDirectory)/device_calendar'
+            script: '$(flutterExecPath) pub publish --force'
+
+  # ----------- CD Production -----------
+  - stage: Release
+    dependsOn: Build
+    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/master'))
+    jobs: 
+     - job: Release
+       pool:
+        vmImage: 'windows-latest'
+       steps:
+        - task: FlutterInstall@0
+          displayName: 'Flutter install'
+          inputs:
+            channel: 'stable'
+            version: 'latest'
+
+        - task: PowerShell@2
+          displayName: 'Get version from pubspec.yaml'
+          inputs:
+            targetType: 'inline'
+            script: |
+              [string] $version = select-string -path "$(Build.SourcesDirectory)/device_calendar/pubspec.yaml" -pattern $(versionGetRegex) | %{ $_.Matches[0].Value }
+
+              Write-Host "##vso[task.setvariable variable=currentVersion]$version"
+
+        - task: PowerShell@2
+          displayName: 'Get version summary from CHANGELOG.md'
+          inputs:
+            targetType: 'inline'
+            script: |
+              [string] $summary = select-string -path "$(Build.SourcesDirectory)/device_calendar/CHANGELOG.md" -pattern "($([regex]::escape($env:currentVersion))).*" | %{ $_.Matches[0].Value }
+
+              Write-Host "##vso[task.setvariable variable=versionSummary]$summary"
+
+        - task: GitHubReleasePublish@1
+          displayName: 'Tag a release to GitHub'
+          inputs:
+            githubEndpoint: 'GitHub Tagging'
+            manuallySetRepository: false
+            githubRepository: 'builttoroam/flutter_plugins'
+            githubTag: 'v$(currentVersion)'
+            githubReleaseTitle: '$(versionSummary)'
+            githubReleaseDraft: false
+            githubReleasePrerelease: false
+            githubIgnoreAssets: false
+            githubReleaseAsset: '$(Build.ArtifactStagingDirectory)/*'
+            githubReuseRelease: false
+            githubReuseDraftOnly: false
+            githubSkipDuplicatedAssets: false
+            githubEditRelease: false
+            githubDeleteEmptyTag: false
+
+        - task: CmdLine@2
+          displayName: 'Dry run publish'
+          inputs:
+            workingDirectory: '$(Build.SourcesDirectory)/device_calendar'
+            script: '$(flutterExecPath) pub publish --dry-run'
+
+        - task: CmdLine@2
+          displayName: 'Publish'
+          inputs:
+            workingDirectory: '$(Build.SourcesDirectory)/device_calendar'
+            script: '$(flutterExecPath) pub publish --force'
+
+        - task: GitHubRelease@1
+          displayName: 'Remove GitHub tag when publish fails'
+          condition: failed()
+          inputs:
+            gitHubConnection: 'GitHub Tagging'
+            repositoryName: 'builttoroam/flutter_plugins'
+            action: 'delete'
+            tag: 'v$(currentVersion)'
+

device_calendar/CHANGELOG.md

@@ -1,6 +1,6 @@
 # Changelog
 
-## 3.1.0
+## 3.1.0 6th March 2020 - Bug fixes and new features
 
 * Boolean variable `isDefault` added for issue [145](https://github.com/builttoroam/flutter_plugins/issues/145) (**NOTE**: This is not supported Android API 16 or lower, `isDefault` will always be false)
 * Events with 'null' title now defaults to 'New Event', issue [126](https://github.com/builttoroam/flutter_plugins/issues/126)
@@ -11,6 +11,18 @@
 * Added to retrieve colour for calendars. Thanks to [nadavfima](https://github.com/nadavfima) for the contribution and PR to add colour support for both Android and iOS
 * Added compatibility with a new Flutter plugin for Android. Thanks to the PR submitted by [RohitKumarMishra](https://github.com/RohitKumarMishra)
 
+## 3.0.0+3 3rd February 2020
+
+* Fixed all day conditional check for issue [162](https://github.com/builttoroam/flutter_plugins/issues/162)
+
+## 3.0.0+2 30th January 2020
+
+* Updated `event.allDay` property in `createOrUpdateEvent` method to be null-aware
+
+## 3.0.0+1 28th January 2020
+
+* Updated `event.url` property in `createOrUpdateEvent` method to be null-aware for issue [152](https://github.com/builttoroam/flutter_plugins/issues/152)
+
 ## 3.0.0 21st January 2020
 
 * **BREAKING CHANGE** Properties for the attendee model in `attendee.dart` file have been changed:

device_calendar/android/src/main/kotlin/com/builttoroam/devicecalendar/CalendarDelegate.kt

@@ -191,9 +191,9 @@ class CalendarDelegate : PluginRegistry.RequestPermissionsResultListener {
             val uri: Uri = CalendarContract.Calendars.CONTENT_URI
 
             val cursor: Cursor? = if (atLeastAPI(17)) {
-                contentResolver?.query(uri, CALENDAR_PROJECTION, null, null, null)
+                contentResolver?.query(ContentUris.withAppendedId(uri, calendarIdNumber), CALENDAR_PROJECTION, null, null, null)
             } else {
-                contentResolver?.query(uri, CALENDAR_PROJECTION_OLDER_API, null, null, null)
+                contentResolver?.query(ContentUris.withAppendedId(uri, calendarIdNumber), CALENDAR_PROJECTION_OLDER_API, null, null, null)
             }
 
             try {

device_calendar/lib/src/device_calendar.dart

@@ -167,16 +167,16 @@ class DeviceCalendarPlugin {
     final res = Result<String>();
 
     // Setting time to 0 for all day events
-    if (event.allDay) {
+    if (event.allDay == true) {
       event.start = DateTime(event.start.year, event.start.month, event.start.day, 0, 0, 0);
       event.end = DateTime(event.end.year, event.end.month, event.end.day, 0, 0, 0);
     }
 
-    if (event.allDay && (event?.calendarId?.isEmpty ?? true) || event.start == null || event.end == null) {
+    if (event.allDay == true && (event?.calendarId?.isEmpty ?? true) || event.start == null || event.end == null) {
       res.errorMessages.add('[${ErrorCodes.invalidArguments}] ${ErrorMessages.createOrUpdateEventInvalidArgumentsMessageAllDay}');
       return res;
     }
-    else if (!event.allDay & ((event?.calendarId?.isEmpty ?? true) || event.start == null || event.end == null || event.start.isAfter(event.end))) {
+    else if (event.allDay != true && ((event?.calendarId?.isEmpty ?? true) || event.start == null || event.end == null || event.start.isAfter(event.end))) {
       res.errorMessages.add('[${ErrorCodes.invalidArguments}] ${ErrorMessages.createOrUpdateEventInvalidArgumentsMessage}');
       return res;
     }
@@ -193,7 +193,7 @@ class DeviceCalendarPlugin {
         'eventStartDate': event.start.millisecondsSinceEpoch,
         'eventEndDate': event.end.millisecondsSinceEpoch,
         'eventLocation': event.location,
-        'eventURL': event.url.data.contentText,
+        'eventURL': event.url?.data?.contentText,
         'recurrenceRule': event.recurrenceRule?.toJson(),
         'attendees': event.attendees?.map((a) => a.toJson())?.toList(),
         'reminders': event.reminders?.map((r) => r.toJson())?.toList()

device_calendar/pubspec.yaml

@@ -7,7 +7,7 @@ dependencies:
   flutter:
     sdk: flutter
   meta: ^1.1.8
-  collection: any
+  collection: ^1.4.11
 
 dev_dependencies:
   flutter_test: