Skip to content

Commit

Permalink
FEATURE: raise version to 2.0.0 for laravel support
Browse files Browse the repository at this point in the history
  • Loading branch information
skurfuerst committed Oct 1, 2024
1 parent f2c1262 commit b4908f6
Show file tree
Hide file tree
Showing 19 changed files with 45 additions and 45 deletions.
4 changes: 2 additions & 2 deletions cmd/root.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package cmd

import (
cmd2 "github.com/sandstorm/synco/pkg/receive/cmd"
"github.com/sandstorm/synco/pkg/serve/cmd"
cmd2 "github.com/sandstorm/synco/v2/pkg/receive/cmd"
"github.com/sandstorm/synco/v2/pkg/serve/cmd"
"github.com/spf13/cobra"
"os"
)
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/sandstorm/synco
module github.com/sandstorm/synco/v2

go 1.19

Expand Down
2 changes: 1 addition & 1 deletion lite/cmd-lite/root-lite.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package cmd

import (
"github.com/sandstorm/synco/pkg/serve/cmd"
"github.com/sandstorm/synco/v2/pkg/serve/cmd"
"github.com/spf13/cobra"
"os"
)
Expand Down
2 changes: 1 addition & 1 deletion lite/main-lite.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package main

import (
cmd_lite "github.com/sandstorm/synco/lite/cmd-lite"
cmd_lite "github.com/sandstorm/synco/v2/lite/cmd-lite"
)

func main() {
Expand Down
2 changes: 1 addition & 1 deletion main.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package main

import (
"github.com/pterm/pterm"
"github.com/sandstorm/synco/cmd"
"github.com/sandstorm/synco/v2/cmd"
"os"
"os/signal"
)
Expand Down
8 changes: 4 additions & 4 deletions pkg/common/commonServe/databaseDump.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ package commonServe
import (
"database/sql"
"github.com/pterm/pterm"
"github.com/sandstorm/synco/pkg/common"
"github.com/sandstorm/synco/pkg/common/dto"
"github.com/sandstorm/synco/pkg/serve"
"github.com/sandstorm/synco/pkg/util/mysql"
"github.com/sandstorm/synco/v2/pkg/common"
"github.com/sandstorm/synco/v2/pkg/common/dto"
"github.com/sandstorm/synco/v2/pkg/serve"
"github.com/sandstorm/synco/v2/pkg/util/mysql"
)

func DatabaseDump(transferSession *serve.TransferSession, dbCredentials *common.DbCredentials, whereClauseForTables map[string]string) *sql.DB {
Expand Down
4 changes: 2 additions & 2 deletions pkg/common/commonServe/writeResources.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package commonServe
import (
"encoding/json"
"github.com/pterm/pterm"
"github.com/sandstorm/synco/pkg/common/dto"
"github.com/sandstorm/synco/pkg/serve"
"github.com/sandstorm/synco/v2/pkg/common/dto"
"github.com/sandstorm/synco/v2/pkg/serve"
)

func WriteResourcesIndex(transferSession *serve.TransferSession, fileSetType dto.FileSetType, name string, resourceFilesIndex dto.PublicFilesIndex, totalSizeBytes uint64) {
Expand Down
4 changes: 2 additions & 2 deletions pkg/common/types.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package common

import (
"github.com/sandstorm/synco/pkg/receive"
"github.com/sandstorm/synco/pkg/serve"
"github.com/sandstorm/synco/v2/pkg/receive"
"github.com/sandstorm/synco/v2/pkg/serve"
)

type ReceiveFramework interface {
Expand Down
4 changes: 2 additions & 2 deletions pkg/frameworks/flowReceive/flowReceive.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package flowReceive

import (
"github.com/sandstorm/synco/pkg/common"
"github.com/sandstorm/synco/pkg/receive"
"github.com/sandstorm/synco/v2/pkg/common"
"github.com/sandstorm/synco/v2/pkg/receive"
)

type flowReceive struct {
Expand Down
10 changes: 5 additions & 5 deletions pkg/frameworks/flowServe/flowServe.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ import (
"database/sql"
"fmt"
"github.com/pterm/pterm"
"github.com/sandstorm/synco/pkg/common"
"github.com/sandstorm/synco/pkg/common/commonServe"
"github.com/sandstorm/synco/pkg/common/dto"
"github.com/sandstorm/synco/pkg/serve"
"github.com/sandstorm/synco/pkg/util"
"github.com/sandstorm/synco/v2/pkg/common"
"github.com/sandstorm/synco/v2/pkg/common/commonServe"
"github.com/sandstorm/synco/v2/pkg/common/dto"
"github.com/sandstorm/synco/v2/pkg/serve"
"github.com/sandstorm/synco/v2/pkg/util"
"gopkg.in/yaml.v3"
"log"
"net/url"
Expand Down
10 changes: 5 additions & 5 deletions pkg/frameworks/laravelServe/laravelServe.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ import (
"encoding/json"
"fmt"
"github.com/pterm/pterm"
"github.com/sandstorm/synco/pkg/common"
"github.com/sandstorm/synco/pkg/common/commonServe"
"github.com/sandstorm/synco/pkg/common/dto"
"github.com/sandstorm/synco/pkg/serve"
"github.com/sandstorm/synco/pkg/util"
"github.com/sandstorm/synco/v2/pkg/common"
"github.com/sandstorm/synco/v2/pkg/common/commonServe"
"github.com/sandstorm/synco/v2/pkg/common/dto"
"github.com/sandstorm/synco/v2/pkg/serve"
"github.com/sandstorm/synco/v2/pkg/util"
"io"
"log"
"net/url"
Expand Down
4 changes: 2 additions & 2 deletions pkg/receive/cmd/framework-registration.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package cmd

import (
"github.com/sandstorm/synco/pkg/common"
"github.com/sandstorm/synco/pkg/frameworks/flowReceive"
"github.com/sandstorm/synco/v2/pkg/common"
"github.com/sandstorm/synco/v2/pkg/frameworks/flowReceive"
)

var RegisteredFrameworks = [...]common.ReceiveFramework{
Expand Down
12 changes: 6 additions & 6 deletions pkg/receive/cmd/receive-cmd.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ import (
"fmt"
"github.com/pterm/pterm"
"github.com/repeale/fp-go"
"github.com/sandstorm/synco/pkg/common/config"
"github.com/sandstorm/synco/pkg/common/dto"
"github.com/sandstorm/synco/pkg/receive"
"github.com/sandstorm/synco/pkg/ui/boolselect"
"github.com/sandstorm/synco/pkg/ui/multiselect"
"github.com/sandstorm/synco/pkg/ui/textinput"
"github.com/sandstorm/synco/v2/pkg/common/config"
"github.com/sandstorm/synco/v2/pkg/common/dto"
"github.com/sandstorm/synco/v2/pkg/receive"
"github.com/sandstorm/synco/v2/pkg/ui/boolselect"
"github.com/sandstorm/synco/v2/pkg/ui/multiselect"
"github.com/sandstorm/synco/v2/pkg/ui/textinput"
"github.com/spf13/cobra"
"io"
"net/url"
Expand Down
4 changes: 2 additions & 2 deletions pkg/receive/receive-session.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
"filippo.io/age"
"fmt"
"github.com/pterm/pterm"
"github.com/sandstorm/synco/pkg/common/dto"
"github.com/sandstorm/synco/pkg/ui/boolselect"
"github.com/sandstorm/synco/v2/pkg/common/dto"
"github.com/sandstorm/synco/v2/pkg/ui/boolselect"
"io"
"net"
"net/http"
Expand Down
6 changes: 3 additions & 3 deletions pkg/serve/cmd/framework-registration.go
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package cmd

import (
"github.com/sandstorm/synco/pkg/common"
"github.com/sandstorm/synco/pkg/frameworks/flowServe"
"github.com/sandstorm/synco/pkg/frameworks/laravelServe"
"github.com/sandstorm/synco/v2/pkg/common"
"github.com/sandstorm/synco/v2/pkg/frameworks/flowServe"
"github.com/sandstorm/synco/v2/pkg/frameworks/laravelServe"
)

var RegisteredFrameworks = [...]common.ServeFramework{
Expand Down
4 changes: 2 additions & 2 deletions pkg/serve/cmd/source-cmd.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ package cmd

import (
"github.com/pterm/pterm"
"github.com/sandstorm/synco/pkg/serve"
"github.com/sandstorm/synco/pkg/util"
"github.com/sandstorm/synco/v2/pkg/serve"
"github.com/sandstorm/synco/v2/pkg/util"
"github.com/spf13/cobra"
"os"
"os/signal"
Expand Down
2 changes: 1 addition & 1 deletion pkg/serve/transfer-session.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"filippo.io/age"
"fmt"
"github.com/pterm/pterm"
"github.com/sandstorm/synco/pkg/common/dto"
"github.com/sandstorm/synco/v2/pkg/common/dto"
"io"
"net/http"
"os"
Expand Down
4 changes: 2 additions & 2 deletions pkg/util/mysql/mysqldump.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"database/sql"
"fmt"
"github.com/go-sql-driver/mysql"
"github.com/sandstorm/synco/pkg/common"
mysqldump "github.com/sandstorm/synco/pkg/util/mysql/go_mysqldump"
"github.com/sandstorm/synco/v2/pkg/common"
mysqldump "github.com/sandstorm/synco/v2/pkg/util/mysql/go_mysqldump"
"io"
)

Expand Down
2 changes: 1 addition & 1 deletion test_e2e/flowframework_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package test_e2e
import (
"github.com/orlangure/gnomock"
"github.com/orlangure/gnomock/preset/mariadb"
"github.com/sandstorm/synco/cmd"
"github.com/sandstorm/synco/v2/cmd"
"io/ioutil"
"os"
"strconv"
Expand Down

0 comments on commit b4908f6

Please sign in to comment.