Move code to v2 subfolder for greater compatibility (#187)

nicksnyder · Jun 11, 2019 · 0c6ce6a · 0c6ce6a
1 parent 25e77af
commit 0c6ce6a
Show file tree

Hide file tree

Showing 50 changed files with 15 additions and 18 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,7 +5,7 @@ output/
 *.test
 *.swp
 
-example/example
-goi18n/goi18n
+v2/example/example
+v2/goi18n/goi18n
 
-dist/
+v2/dist/
diff --git a/.golangci.yml b/.golangci.yml
@@ -1,8 +1,8 @@
 # https://github.com/golangci/golangci/wiki/Configuration
 
-service:
-  prepare:
-    - go get -t ./...
+# service:
+#   prepare:
+#     - go get -t ./...
 linters:
   enable:
     - gofmt
diff --git a/.travis.yml b/.travis.yml
@@ -7,19 +7,16 @@ matrix:
     - go: 1.12.x
       env: GO111MODULE=on COVER='-coverprofile=coverage.txt -covermode=atomic'
 
-install:
-  - go get -t -v ./...
-
 script:
-  - go test -race $COVER ./...
+  - cd v2; go test -race $COVER ./...
 
 after_success:
   - bash <(curl -s https://codecov.io/bash)
 
 deploy:
 - provider: script
   skip_cleanup: true
-  script: curl -sL https://git.io/goreleaser | bash
+  script: cd v2; curl -sL https://git.io/goreleaser | bash
   on:
     tags: true
     condition: $TRAVIS_OS_NAME = linux
diff --git a/README.md b/README.md
@@ -7,7 +7,7 @@ go-i18n is a Go [package](#package-i18n) and a [command](#command-goi18n) that h
 - Supports strings with named variables using [text/template](http://golang.org/pkg/text/template/) syntax.
 - Supports message files of any format (e.g. JSON, TOML, YAML).
 
-## Package i18n [![GoDoc](http://godoc.org/github.com/nicksnyder/go-i18n?status.svg)](http://godoc.org/github.com/nicksnyder/go-i18n/i18n)
+## Package i18n [![GoDoc](http://godoc.org/github.com/nicksnyder/go-i18n?status.svg)](http://godoc.org/github.com/nicksnyder/go-i18n/v2/i18n)
 
 The i18n package provides support for looking up messages according to a set of locale preferences.
 
@@ -55,7 +55,7 @@ localizer.Localize(&i18n.LocalizeConfig{
 }) // Nick has 2 cats.
 ```
 
-## Command goi18n [![GoDoc](http://godoc.org/github.com/nicksnyder/go-i18n?status.svg)](http://godoc.org/github.com/nicksnyder/go-i18n/goi18n)
+## Command goi18n [![GoDoc](http://godoc.org/github.com/nicksnyder/go-i18n?status.svg)](http://godoc.org/github.com/nicksnyder/go-i18n/v2/goi18n)
 
 The goi18n command manages message files used by the i18n package.
 
@@ -115,9 +115,9 @@ If you have added new messages to your program:
 
 ## For more information and examples:
 
-- Read the [documentation](http://godoc.org/github.com/nicksnyder/go-i18n/).
-- Look at the [code examples](https://github.com/nicksnyder/go-i18n/blob/master/i18n/example_test.go) and [tests](https://github.com/nicksnyder/go-i18n/blob/master/i18n/localizer_test.go).
-- Look at an example [application](https://github.com/nicksnyder/go-i18n/tree/master/example).
+- Read the [documentation](http://godoc.org/github.com/nicksnyder/go-i18n/v2).
+- Look at the [code examples](https://github.com/nicksnyder/go-i18n/blob/master/v2/i18n/example_test.go) and [tests](https://github.com/nicksnyder/go-i18n/blob/master/i18n/v2/localizer_test.go).
+- Look at an example [application](https://github.com/nicksnyder/go-i18n/tree/master/v2/example).
 
 ## License
 

diff --git a/dev.md b/dev.md
@@ -4,5 +4,5 @@
 
 1.  Go to http://cldr.unicode.org/index/downloads to find the latest version.
 1.  Download the latest version of cldr-common (e.g. http://unicode.org/Public/cldr/33/cldr-common-33.0.zip)
-1.  Unzip and copy `common/supplemental/plurals.xml` to `i18n/internal/plural/codegen/plurals.xml`
-1.  Run `generate.sh` in `i18n/internal/plural/codegen/`
+1.  Unzip and copy `v2/common/supplemental/plurals.xml` to `v2/i18n/internal/plural/codegen/plurals.xml`
+1.  Run `generate.sh` in `v2/i18n/internal/plural/codegen/`
diff --git a/.goreleaser.yml → v2/.goreleaser.yml b/.goreleaser.yml → v2/.goreleaser.yml
diff --git a/example/README.md → v2/example/README.md b/example/README.md → v2/example/README.md
diff --git a/example/active.en.toml → v2/example/active.en.toml b/example/active.en.toml → v2/example/active.en.toml
diff --git a/example/active.es.toml → v2/example/active.es.toml b/example/active.es.toml → v2/example/active.es.toml
diff --git a/example/main.go → v2/example/main.go b/example/main.go → v2/example/main.go
diff --git a/go.mod → v2/go.mod b/go.mod → v2/go.mod
diff --git a/go.sum → v2/go.sum b/go.sum → v2/go.sum
diff --git a/goi18n/active.en.toml → v2/goi18n/active.en.toml b/goi18n/active.en.toml → v2/goi18n/active.en.toml
diff --git a/goi18n/common_test.go → v2/goi18n/common_test.go b/goi18n/common_test.go → v2/goi18n/common_test.go
diff --git a/goi18n/extract_command.go → v2/goi18n/extract_command.go b/goi18n/extract_command.go → v2/goi18n/extract_command.go
diff --git a/goi18n/extract_command_test.go → v2/goi18n/extract_command_test.go b/goi18n/extract_command_test.go → v2/goi18n/extract_command_test.go
diff --git a/goi18n/main.go → v2/goi18n/main.go b/goi18n/main.go → v2/goi18n/main.go
diff --git a/goi18n/main_test.go → v2/goi18n/main_test.go b/goi18n/main_test.go → v2/goi18n/main_test.go
diff --git a/goi18n/marshal.go → v2/goi18n/marshal.go b/goi18n/marshal.go → v2/goi18n/marshal.go
diff --git a/goi18n/merge_command.go → v2/goi18n/merge_command.go b/goi18n/merge_command.go → v2/goi18n/merge_command.go
diff --git a/goi18n/merge_command_test.go → v2/goi18n/merge_command_test.go b/goi18n/merge_command_test.go → v2/goi18n/merge_command_test.go
diff --git a/i18n/bundle.go → v2/i18n/bundle.go b/i18n/bundle.go → v2/i18n/bundle.go
diff --git a/i18n/bundle_test.go → v2/i18n/bundle_test.go b/i18n/bundle_test.go → v2/i18n/bundle_test.go
diff --git a/i18n/doc.go → v2/i18n/doc.go b/i18n/doc.go → v2/i18n/doc.go
diff --git a/i18n/example_test.go → v2/i18n/example_test.go b/i18n/example_test.go → v2/i18n/example_test.go
diff --git a/i18n/language_test.go → v2/i18n/language_test.go b/i18n/language_test.go → v2/i18n/language_test.go
diff --git a/i18n/localizer.go → v2/i18n/localizer.go b/i18n/localizer.go → v2/i18n/localizer.go
diff --git a/i18n/localizer_test.go → v2/i18n/localizer_test.go b/i18n/localizer_test.go → v2/i18n/localizer_test.go
diff --git a/i18n/message.go → v2/i18n/message.go b/i18n/message.go → v2/i18n/message.go
diff --git a/i18n/message_template.go → v2/i18n/message_template.go b/i18n/message_template.go → v2/i18n/message_template.go
diff --git a/i18n/message_template_test.go → v2/i18n/message_template_test.go b/i18n/message_template_test.go → v2/i18n/message_template_test.go
diff --git a/i18n/message_test.go → v2/i18n/message_test.go b/i18n/message_test.go → v2/i18n/message_test.go
diff --git a/i18n/parse.go → v2/i18n/parse.go b/i18n/parse.go → v2/i18n/parse.go
diff --git a/i18n/parse_test.go → v2/i18n/parse_test.go b/i18n/parse_test.go → v2/i18n/parse_test.go
diff --git a/internal/plural/codegen/generate.sh → v2/internal/plural/codegen/generate.sh b/internal/plural/codegen/generate.sh → v2/internal/plural/codegen/generate.sh
diff --git a/internal/plural/codegen/main.go → v2/internal/plural/codegen/main.go b/internal/plural/codegen/main.go → v2/internal/plural/codegen/main.go
diff --git a/internal/plural/codegen/plurals.xml → v2/internal/plural/codegen/plurals.xml b/internal/plural/codegen/plurals.xml → v2/internal/plural/codegen/plurals.xml
diff --git a/internal/plural/codegen/xml.go → v2/internal/plural/codegen/xml.go b/internal/plural/codegen/xml.go → v2/internal/plural/codegen/xml.go
diff --git a/internal/plural/doc.go → v2/internal/plural/doc.go b/internal/plural/doc.go → v2/internal/plural/doc.go
diff --git a/internal/plural/form.go → v2/internal/plural/form.go b/internal/plural/form.go → v2/internal/plural/form.go
diff --git a/internal/plural/operands.go → v2/internal/plural/operands.go b/internal/plural/operands.go → v2/internal/plural/operands.go
diff --git a/internal/plural/operands_test.go → v2/internal/plural/operands_test.go b/internal/plural/operands_test.go → v2/internal/plural/operands_test.go
diff --git a/internal/plural/rule.go → v2/internal/plural/rule.go b/internal/plural/rule.go → v2/internal/plural/rule.go
diff --git a/internal/plural/rule_gen.go → v2/internal/plural/rule_gen.go b/internal/plural/rule_gen.go → v2/internal/plural/rule_gen.go
diff --git a/internal/plural/rule_gen_test.go → v2/internal/plural/rule_gen_test.go b/internal/plural/rule_gen_test.go → v2/internal/plural/rule_gen_test.go
diff --git a/internal/plural/rule_test.go → v2/internal/plural/rule_test.go b/internal/plural/rule_test.go → v2/internal/plural/rule_test.go
diff --git a/internal/plural/rules.go → v2/internal/plural/rules.go b/internal/plural/rules.go → v2/internal/plural/rules.go
diff --git a/internal/plural/rules_test.go → v2/internal/plural/rules_test.go b/internal/plural/rules_test.go → v2/internal/plural/rules_test.go
diff --git a/internal/template.go → v2/internal/template.go b/internal/template.go → v2/internal/template.go
diff --git a/internal/template_test.go → v2/internal/template_test.go b/internal/template_test.go → v2/internal/template_test.go