Skip to content

Commit

Permalink
Use canonical imports
Browse files Browse the repository at this point in the history
  • Loading branch information
fguillot committed Aug 25, 2018
1 parent 7f2612d commit dbcc5d8
Show file tree
Hide file tree
Showing 263 changed files with 962 additions and 956 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ services:
addons:
postgresql: "9.4"
language: go
go_import_path: "miniflux.app"
go:
- "1.10"
before_install:
Expand Down
14 changes: 7 additions & 7 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,22 +8,22 @@ DB_URL := postgres://postgres:postgres@localhost/miniflux_test?sslmode=disable

linux:
@ go generate
@ GOOS=linux GOARCH=amd64 go build -ldflags="-s -w -X 'github.com/miniflux/miniflux/version.Version=$(VERSION)' -X 'github.com/miniflux/miniflux/version.BuildDate=$(BUILD_DATE)'" -o $(APP)-linux-amd64 main.go
@ GOOS=linux GOARCH=amd64 go build -ldflags="-s -w -X 'miniflux.app/version.Version=$(VERSION)' -X 'miniflux.app/version.BuildDate=$(BUILD_DATE)'" -o $(APP)-linux-amd64 main.go

linux-arm:
@ go generate
@ GOOS=linux GOARCH=arm64 go build -ldflags="-s -w -X 'github.com/miniflux/miniflux/version.Version=$(VERSION)' -X 'github.com/miniflux/miniflux/version.BuildDate=$(BUILD_DATE)'" -o $(APP)-linux-armv8 main.go
@ GOOS=linux GOARCH=arm GOARM=7 go build -ldflags="-s -w -X 'github.com/miniflux/miniflux/version.Version=$(VERSION)' -X 'github.com/miniflux/miniflux/version.BuildDate=$(BUILD_DATE)'" -o $(APP)-linux-armv7 main.go
@ GOOS=linux GOARCH=arm GOARM=6 go build -ldflags="-s -w -X 'github.com/miniflux/miniflux/version.Version=$(VERSION)' -X 'github.com/miniflux/miniflux/version.BuildDate=$(BUILD_DATE)'" -o $(APP)-linux-armv6 main.go
@ GOOS=linux GOARCH=arm GOARM=5 go build -ldflags="-s -w -X 'github.com/miniflux/miniflux/version.Version=$(VERSION)' -X 'github.com/miniflux/miniflux/version.BuildDate=$(BUILD_DATE)'" -o $(APP)-linux-armv5 main.go
@ GOOS=linux GOARCH=arm64 go build -ldflags="-s -w -X 'miniflux.app/version.Version=$(VERSION)' -X 'miniflux.app/version.BuildDate=$(BUILD_DATE)'" -o $(APP)-linux-armv8 main.go
@ GOOS=linux GOARCH=arm GOARM=7 go build -ldflags="-s -w -X 'miniflux.app/version.Version=$(VERSION)' -X 'miniflux.app/version.BuildDate=$(BUILD_DATE)'" -o $(APP)-linux-armv7 main.go
@ GOOS=linux GOARCH=arm GOARM=6 go build -ldflags="-s -w -X 'miniflux.app/version.Version=$(VERSION)' -X 'miniflux.app/version.BuildDate=$(BUILD_DATE)'" -o $(APP)-linux-armv6 main.go
@ GOOS=linux GOARCH=arm GOARM=5 go build -ldflags="-s -w -X 'miniflux.app/version.Version=$(VERSION)' -X 'miniflux.app/version.BuildDate=$(BUILD_DATE)'" -o $(APP)-linux-armv5 main.go

darwin:
@ go generate
@ GOOS=darwin GOARCH=amd64 go build -ldflags="-s -w -X 'github.com/miniflux/miniflux/version.Version=$(VERSION)' -X 'github.com/miniflux/miniflux/version.BuildDate=$(BUILD_DATE)'" -o $(APP)-darwin-amd64 main.go
@ GOOS=darwin GOARCH=amd64 go build -ldflags="-s -w -X 'miniflux.app/version.Version=$(VERSION)' -X 'miniflux.app/version.BuildDate=$(BUILD_DATE)'" -o $(APP)-darwin-amd64 main.go

freebsd:
@ go generate
@ GOOS=freebsd GOARCH=amd64 go build -ldflags="-s -w -X 'githug.com/miniflux/miniflux/version.Version=$(VERSION)' -X 'github.com/miniflux/miniflux/version.BuildDate=$(BUILD_DATE)'" -o $(APP)-freebsd-amd64 main.go
@ GOOS=freebsd GOARCH=amd64 go build -ldflags="-s -w -X 'miniflux.app/version.Version=$(VERSION)' -X 'miniflux.app/version.BuildDate=$(BUILD_DATE)'" -o $(APP)-freebsd-amd64 main.go

build: linux linux-arm darwin freebsd

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Miniflux 2
==========
[![Build Status](https://travis-ci.org/miniflux/miniflux.svg?branch=master)](https://travis-ci.org/miniflux/miniflux)
[![GoDoc](https://godoc.org/github.com/miniflux/miniflux?status.svg)](https://godoc.org/github.com/miniflux/miniflux)
[![GoDoc](https://godoc.org/miniflux.app?status.svg)](https://godoc.org/miniflux.app)
[![Documentation Status](https://readthedocs.org/projects/miniflux/badge/?version=latest)](https://docs.miniflux.app/)

Miniflux is a minimalist and opinionated feed reader:
Expand Down
8 changes: 4 additions & 4 deletions api/category.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
// Use of this source code is governed by the Apache 2.0
// license that can be found in the LICENSE file.

package api
package api // import "miniflux.app/api"

import (
"errors"
"net/http"

"github.com/miniflux/miniflux/http/context"
"github.com/miniflux/miniflux/http/request"
"github.com/miniflux/miniflux/http/response/json"
"miniflux.app/http/context"
"miniflux.app/http/request"
"miniflux.app/http/response/json"
)

// CreateCategory is the API handler to create a new category.
Expand Down
6 changes: 3 additions & 3 deletions api/controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
// Use of this source code is governed by the Apache 2.0
// license that can be found in the LICENSE file.

package api
package api // import "miniflux.app/api"

import (
"github.com/miniflux/miniflux/reader/feed"
"github.com/miniflux/miniflux/storage"
"miniflux.app/reader/feed"
"miniflux.app/storage"
)

// Controller holds all handlers for the API.
Expand Down
2 changes: 1 addition & 1 deletion api/doc.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@
Package api implements API endpoints for Miniflux application.
*/
package api
package api // import "miniflux.app/api"
12 changes: 6 additions & 6 deletions api/entry.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,18 @@
// Use of this source code is governed by the Apache 2.0
// license that can be found in the LICENSE file.

package api
package api // import "miniflux.app/api"

import (
"errors"
"net/http"
"time"

"github.com/miniflux/miniflux/http/context"
"github.com/miniflux/miniflux/http/request"
"github.com/miniflux/miniflux/http/response/json"
"github.com/miniflux/miniflux/model"
"github.com/miniflux/miniflux/storage"
"miniflux.app/http/context"
"miniflux.app/http/request"
"miniflux.app/http/response/json"
"miniflux.app/model"
"miniflux.app/storage"
)

// GetFeedEntry is the API handler to get a single feed entry.
Expand Down
8 changes: 4 additions & 4 deletions api/feed.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
// Use of this source code is governed by the Apache 2.0
// license that can be found in the LICENSE file.

package api
package api // import "miniflux.app/api"

import (
"errors"
"net/http"

"github.com/miniflux/miniflux/http/context"
"github.com/miniflux/miniflux/http/request"
"github.com/miniflux/miniflux/http/response/json"
"miniflux.app/http/context"
"miniflux.app/http/request"
"miniflux.app/http/response/json"
)

// CreateFeed is the API handler to create a new feed.
Expand Down
8 changes: 4 additions & 4 deletions api/icon.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
// Use of this source code is governed by the Apache 2.0
// license that can be found in the LICENSE file.

package api
package api // import "miniflux.app/api"

import (
"errors"
"net/http"

"github.com/miniflux/miniflux/http/context"
"github.com/miniflux/miniflux/http/request"
"github.com/miniflux/miniflux/http/response/json"
"miniflux.app/http/context"
"miniflux.app/http/request"
"miniflux.app/http/response/json"
)

// FeedIcon returns a feed icon.
Expand Down
10 changes: 5 additions & 5 deletions api/opml.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
// Use of this source code is governed by the Apache 2.0
// license that can be found in the LICENSE file.

package api
package api // import "miniflux.app/api"

import (
"net/http"

"github.com/miniflux/miniflux/http/context"
"github.com/miniflux/miniflux/http/response/json"
"github.com/miniflux/miniflux/http/response/xml"
"github.com/miniflux/miniflux/reader/opml"
"miniflux.app/http/context"
"miniflux.app/http/response/json"
"miniflux.app/http/response/xml"
"miniflux.app/reader/opml"
)

// Export is the API handler that export feeds to OPML.
Expand Down
4 changes: 2 additions & 2 deletions api/payload.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
// Use of this source code is governed by the Apache 2.0
// license that can be found in the LICENSE file.

package api
package api // import "miniflux.app/api"

import (
"encoding/json"
"fmt"
"io"

"github.com/miniflux/miniflux/model"
"miniflux.app/model"
)

type feedIcon struct {
Expand Down
4 changes: 2 additions & 2 deletions api/payload_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
// Use of this source code is governed by the Apache 2.0
// license that can be found in the LICENSE file.

package api
package api // import "miniflux.app/api"

import (
"testing"

"github.com/miniflux/miniflux/model"
"miniflux.app/model"
)

func TestUpdateFeedURL(t *testing.T) {
Expand Down
6 changes: 3 additions & 3 deletions api/subscription.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
// Use of this source code is governed by the Apache 2.0
// license that can be found in the LICENSE file.

package api
package api // import "miniflux.app/api"

import (
"errors"
"fmt"
"net/http"

"github.com/miniflux/miniflux/http/response/json"
"github.com/miniflux/miniflux/reader/subscription"
"miniflux.app/http/response/json"
"miniflux.app/reader/subscription"
)

// GetSubscriptions is the API handler to find subscriptions.
Expand Down
8 changes: 4 additions & 4 deletions api/user.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
// Use of this source code is governed by the Apache 2.0
// license that can be found in the LICENSE file.

package api
package api // import "miniflux.app/api"

import (
"errors"
"net/http"

"github.com/miniflux/miniflux/http/context"
"github.com/miniflux/miniflux/http/request"
"github.com/miniflux/miniflux/http/response/json"
"miniflux.app/http/context"
"miniflux.app/http/request"
"miniflux.app/http/response/json"
)

// CurrentUser is the API handler to retrieve the authenticated user.
Expand Down
2 changes: 1 addition & 1 deletion cli/ask_credentials.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Use of this source code is governed by the Apache 2.0
// license that can be found in the LICENSE file.

package cli
package cli // import "miniflux.app/cli"

import (
"bufio"
Expand Down
14 changes: 7 additions & 7 deletions cli/cli.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,18 @@
// Use of this source code is governed by the Apache 2.0
// license that can be found in the LICENSE file.

package cli
package cli // import "miniflux.app/cli"

import (
"flag"
"fmt"

"github.com/miniflux/miniflux/config"
"github.com/miniflux/miniflux/daemon"
"github.com/miniflux/miniflux/database"
"github.com/miniflux/miniflux/logger"
"github.com/miniflux/miniflux/storage"
"github.com/miniflux/miniflux/version"
"miniflux.app/config"
"miniflux.app/daemon"
"miniflux.app/database"
"miniflux.app/logger"
"miniflux.app/storage"
"miniflux.app/version"
)

// Parse parses command line arguments.
Expand Down
6 changes: 3 additions & 3 deletions cli/create_admin.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
// Use of this source code is governed by the Apache 2.0
// license that can be found in the LICENSE file.

package cli
package cli // import "miniflux.app/cli"

import (
"fmt"
"os"

"github.com/miniflux/miniflux/model"
"github.com/miniflux/miniflux/storage"
"miniflux.app/model"
"miniflux.app/storage"
)

func createAdmin(store *storage.Storage) {
Expand Down
2 changes: 1 addition & 1 deletion cli/doc.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@
Package cli implements command line arguments for Miniflux application.
*/
package cli
package cli // import "miniflux.app/cli"
4 changes: 2 additions & 2 deletions cli/flush_sessions.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
// Use of this source code is governed by the Apache 2.0
// license that can be found in the LICENSE file.

package cli
package cli // import "miniflux.app/cli"

import (
"fmt"
"os"

"github.com/miniflux/miniflux/storage"
"miniflux.app/storage"
)

func flushSessions(store *storage.Storage) {
Expand Down
4 changes: 2 additions & 2 deletions cli/info.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
// Use of this source code is governed by the Apache 2.0
// license that can be found in the LICENSE file.

package cli
package cli // import "miniflux.app/cli"

import (
"fmt"
"runtime"

"github.com/miniflux/miniflux/version"
"miniflux.app/version"
)

func info() {
Expand Down
4 changes: 2 additions & 2 deletions cli/reset_password.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
// Use of this source code is governed by the Apache 2.0
// license that can be found in the LICENSE file.

package cli
package cli // import "miniflux.app/cli"

import (
"fmt"
"os"

"github.com/miniflux/miniflux/storage"
"miniflux.app/storage"
)

func resetPassword(store *storage.Storage) {
Expand Down
4 changes: 2 additions & 2 deletions config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
// Use of this source code is governed by the Apache 2.0
// license that can be found in the LICENSE file.

package config
package config // import "miniflux.app/config"

import (
"net/url"
"os"
"strconv"
"strings"

"github.com/miniflux/miniflux/logger"
"miniflux.app/logger"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion config/config_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Use of this source code is governed by the Apache 2.0
// license that can be found in the LICENSE file.

package config
package config // import "miniflux.app/config"

import (
"os"
Expand Down
2 changes: 1 addition & 1 deletion config/doc.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@
Package config handles configuration values for Miniflux application.
*/
package config
package config // import "miniflux.app/config"
2 changes: 1 addition & 1 deletion crypto/crypto.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Use of this source code is governed by the Apache 2.0
// license that can be found in the LICENSE file.

package crypto
package crypto // import "miniflux.app/crypto"

import (
"crypto/rand"
Expand Down
2 changes: 1 addition & 1 deletion crypto/doc.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@
Package crypto implements helpers related to cryptography.
*/
package crypto
package crypto // import "miniflux.app/crypto"
Loading

0 comments on commit dbcc5d8

Please sign in to comment.