From efa71773a80c336ea6447c6d1f6be7878d2a7b85 Mon Sep 17 00:00:00 2001 From: Lev <1187448+levb@users.noreply.github.com> Date: Wed, 6 Apr 2022 09:12:37 -0700 Subject: [PATCH] Bump to 1.0 (#312) * Bump to 1.0 * Update release_notes_url to use 1.0.0 * change min_server_version to 6.6.0 * trying to fix e2e test * update server version in e2e test * update min_server_version in plugin.json * try more up-to-date server commit * update go.mod dep for mattermost-server Co-authored-by: Michael Kochell <6913320+mickmister@users.noreply.github.com> Co-authored-by: Mattermod --- .circleci/config.yml | 2 +- cmd/appsctl/aws.go | 2 +- dev/docker-compose.yml | 2 +- examples/go/hello-jwt/hello.go | 2 +- examples/go/hello-oauth2/hello.go | 2 +- examples/go/hello-serverless/manifest.json | 2 +- examples/go/hello-webhooks/hello.go | 2 +- examples/go/hello-world/hello.go | 2 +- go.mod | 2 +- go.sum | 4 ++-- plugin.json | 6 +++--- 11 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 85dc4d952..f92b66a9c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -187,7 +187,7 @@ jobs: # Keep the commit in sync with go.mod command: | git clone -n https://github.com/mattermost/mattermost-server.git - cd mattermost-server && git checkout 7710a2fe3741 + cd mattermost-server && git checkout 2aa06529c50a - *restore_go_cache - run: name: Running e2e tests diff --git a/cmd/appsctl/aws.go b/cmd/appsctl/aws.go index 860741bc4..ca29c2ec9 100644 --- a/cmd/appsctl/aws.go +++ b/cmd/appsctl/aws.go @@ -160,7 +160,7 @@ func helloServerless() apps.App { DeployType: apps.DeployAWSLambda, Manifest: apps.Manifest{ AppID: "hello-serverless", - Version: "0.8.0", + Version: "1.0.0", Deploy: apps.Deploy{ AWSLambda: &apps.AWSLambda{ Functions: []apps.AWSLambdaFunction{ diff --git a/dev/docker-compose.yml b/dev/docker-compose.yml index 0a2b2dc47..7c244c233 100644 --- a/dev/docker-compose.yml +++ b/dev/docker-compose.yml @@ -20,7 +20,7 @@ services: MM_FEATUREFLAGS_AppsEnabled: "true" # This can be updated with release versions from https://github.com/mattermost/mattermost-plugin-apps/releases - MM_FEATUREFLAGS_PluginApps: "0.7.0" + MM_FEATUREFLAGS_PluginApps: "1.0.0" MM_LOGSETTINGS_CONSOLELEVEL: DEBUG MM_LOGSETTINGS_FILELEVEL: DEBUG diff --git a/examples/go/hello-jwt/hello.go b/examples/go/hello-jwt/hello.go index ce278c3c2..09d647de4 100644 --- a/examples/go/hello-jwt/hello.go +++ b/examples/go/hello-jwt/hello.go @@ -22,7 +22,7 @@ var iconData []byte var manifest = apps.Manifest{ AppID: "hello-jwt", - Version: "v0.8.0", + Version: "v1.0.0", DisplayName: "Hello, JWT!", Icon: "icon.png", HomepageURL: "https://github.com/mattermost/mattermost-plugin-apps/examples/go/hello-jwt", diff --git a/examples/go/hello-oauth2/hello.go b/examples/go/hello-oauth2/hello.go index 56bd5de89..71ebd1596 100644 --- a/examples/go/hello-oauth2/hello.go +++ b/examples/go/hello-oauth2/hello.go @@ -25,7 +25,7 @@ var iconData []byte var manifest = apps.Manifest{ AppID: "hello-oauth2", - Version: "0.8.0", + Version: "1.0.0", DisplayName: "Hello, OAuth2!", Icon: "icon.png", HomepageURL: "https://github.com/mattermost/mattermost-plugin-apps/examples/go/hello-oauth2", diff --git a/examples/go/hello-serverless/manifest.json b/examples/go/hello-serverless/manifest.json index 3b42c1ae6..c439cf494 100644 --- a/examples/go/hello-serverless/manifest.json +++ b/examples/go/hello-serverless/manifest.json @@ -1,6 +1,6 @@ { "app_id": "hello-serverless", - "version": "0.8.0", + "version": "1.0.0", "display_name": "Hello, Serverless!", "homepage_url": "https://github.com/mattermost/mattermost-plugin-apps", "requested_permissions": [ diff --git a/examples/go/hello-webhooks/hello.go b/examples/go/hello-webhooks/hello.go index bbeef8c7c..fff918f47 100644 --- a/examples/go/hello-webhooks/hello.go +++ b/examples/go/hello-webhooks/hello.go @@ -24,7 +24,7 @@ var iconData []byte var manifest = apps.Manifest{ AppID: "hello-webhooks", - Version: "0.8.0", + Version: "1.0.0", DisplayName: "Hello, Webhooks!", Icon: "icon.png", HomepageURL: "https://github.com/mattermost/mattermost-plugin-apps/examples/go/hello-webhooks", diff --git a/examples/go/hello-world/hello.go b/examples/go/hello-world/hello.go index 59064433a..ec87c6f43 100644 --- a/examples/go/hello-world/hello.go +++ b/examples/go/hello-world/hello.go @@ -26,7 +26,7 @@ var Manifest = apps.Manifest{ AppID: "hello-world", // App's release/version. - Version: "v0.8.0", + Version: "v1.0.0", // A (long) display name for the app. DisplayName: "Hello, world!", diff --git a/go.mod b/go.mod index f091d13de..eedbcde00 100644 --- a/go.mod +++ b/go.mod @@ -11,7 +11,7 @@ require ( github.com/hashicorp/go-getter v1.5.5 github.com/hashicorp/go-multierror v1.1.1 github.com/mattermost/mattermost-plugin-api v0.0.22-0.20211210183909-beb4761e4bd3 - github.com/mattermost/mattermost-server/v6 v6.0.0-20220315170027-7710a2fe3741 + github.com/mattermost/mattermost-server/v6 v6.0.0-20220329145947-2aa06529c50a github.com/nicksnyder/go-i18n/v2 v2.2.0 github.com/openfaas/faas-cli v0.0.0-20210705110531-a230119be00f github.com/pkg/errors v0.9.1 diff --git a/go.sum b/go.sum index ccf90bbf5..599aa010a 100644 --- a/go.sum +++ b/go.sum @@ -1099,8 +1099,8 @@ github.com/mattermost/logr/v2 v2.0.15/go.mod h1:mpPp935r5dIkFDo2y9Q87cQWhFR/4xXp github.com/mattermost/mattermost-plugin-api v0.0.22-0.20211210183909-beb4761e4bd3 h1:lmlPLKFru+w/ObEfadd7r1RXouspgxxxM3RtWOrxezE= github.com/mattermost/mattermost-plugin-api v0.0.22-0.20211210183909-beb4761e4bd3/go.mod h1:I4yKjtDUWABNNultKu8EIl4hkBeEdaHgFi0moqEd/Hs= github.com/mattermost/mattermost-server/v6 v6.0.0-20211207185652-92e80bd4ed31/go.mod h1:be9lN1LmfsUnK2ilK+Iao8Al9fGd57oZBQsfNlzsOHU= -github.com/mattermost/mattermost-server/v6 v6.0.0-20220315170027-7710a2fe3741 h1:VzzTJt2q1KLBHMazYgVNNdeMCWfRXLjXzBmP6ia1MRc= -github.com/mattermost/mattermost-server/v6 v6.0.0-20220315170027-7710a2fe3741/go.mod h1:wuU+QtI2l7MiRvHY07i3Sdw3InnVIL3D36mYJ/XNzDA= +github.com/mattermost/mattermost-server/v6 v6.0.0-20220329145947-2aa06529c50a h1:QkYK7ZmiuVmK2uTTY7d5o7xE16rR2h1T0ReooejSLh0= +github.com/mattermost/mattermost-server/v6 v6.0.0-20220329145947-2aa06529c50a/go.mod h1:wuU+QtI2l7MiRvHY07i3Sdw3InnVIL3D36mYJ/XNzDA= github.com/mattermost/morph v0.0.0-20220222074146-cff3f12ff131 h1:agJMxBP8LV0nyV90PZ/BHmmjNyvzTWqR20wLwiXHx14= github.com/mattermost/morph v0.0.0-20220222074146-cff3f12ff131/go.mod h1:jxM3g1bx+k2Thz7jofcHguBS8TZn5Pc+o5MGmORObhw= github.com/mattermost/rsc v0.0.0-20160330161541-bbaefb05eaa0 h1:G9tL6JXRBMzjuD1kkBtcnd42kUiT6QDwxfFYu7adM6o= diff --git a/plugin.json b/plugin.json index be06402d2..d06977ab5 100644 --- a/plugin.json +++ b/plugin.json @@ -4,9 +4,9 @@ "description": "This plugin powers the Mattermost Apps Framework and is required for any Apps to run", "homepage_url": "https://mattermost.com/marketplace/app-framework", "support_url": "https://github.com/mattermost/mattermost-plugin-apps/issues", - "release_notes_url": "https://github.com/mattermost/mattermost-plugin-apps/releases/tag/v0.7.0", - "version": "0.7.0", - "min_server_version": "6.2.0", + "release_notes_url": "https://github.com/mattermost/mattermost-plugin-apps/releases/tag/v1.0.0", + "version": "1.0.0", + "min_server_version": "6.6.0", "server": { "executables": { "linux-amd64": "server/dist/plugin-linux-amd64",