Merge pull request #214 from revel/master

v1.1.1 hotfix sync

.travis.yml

@@ -1,8 +1,8 @@
 language: go
 
 go:
-  - "1.18.x"
-  - "1.17.x"
+  - "1.13.x"
+  - "1.14.x"
   - "tip"
 
 os:
@@ -66,14 +66,6 @@ script:
   - revel new     --gomod-flags "edit -replace=github.com/revel/revel=github.com/revel/revel@$REVEL_BRANCH" -a my/testapp3 --package revelframework.com
   - revel test    --gomod-flags "edit -replace=github.com/revel/revel=github.com/revel/revel@$REVEL_BRANCH" -a my/testapp3
 
-  # Check vendored version of revel
-  - cd $INITIALWD
-  - revel new     --gomod-flags "edit -replace=github.com/revel/revel=github.com/revel/revel@$REVEL_BRANCH" -a my/testapp4 --package revelframework.com
-  - cd my/testapp4
-  - go mod vendor
-  - cd ../..
-  - revel test    --gomod-flags "edit -replace=github.com/revel/revel=github.com/revel/revel@$REVEL_BRANCH" -a my/testapp4
-
 matrix:
   allow_failures:
     - go: tip

.vscode/tasks.json

@@ -6,7 +6,7 @@
         {
             "label": "Clean-Test-Project",
             "type": "shell",
-            "command": "rm -rf ${workspaceRoot}/.temp/revel/reveltest"
+            "command": "rm -rf ${workspaceRoot}/.temp/revel/testproject"
         },
         {
             "label": "Update Go Mod",

go.mod

@@ -2,11 +2,6 @@ module github.com/revel/cmd
 
 go 1.17
 
-retract (
-    v1.1.0 // v1.1.0-1.1.1 are failed releases
-    v1.1.1
-)
-
 require (
 	github.com/BurntSushi/toml v1.0.0 // indirect
 	github.com/agtorre/gocolorize v1.0.0
@@ -20,10 +15,10 @@ require (
 	github.com/myesui/uuid v1.0.0 // indirect
 	github.com/pkg/errors v0.9.1
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/revel/config v1.1.0
+	github.com/revel/config v1.0.0
 	github.com/revel/log15 v2.11.20+incompatible
 	github.com/revel/pathtree v0.0.0-20140121041023-41257a1839e9 // indirect
-	github.com/revel/revel v1.1.0
+	github.com/revel/revel v1.0.0
 	github.com/stretchr/testify v1.7.0
 	github.com/twinj/uuid v1.0.0 // indirect
 	github.com/xeonx/timeago v1.0.0-rc4 // indirect

harness/build.go

@@ -224,25 +224,10 @@ func Build(c *model.CommandConfig, paths *model.RevelContainer) (_ *App, err err
 			utils.Logger.Info("Build failed no missing imports", "message", stOutput)
 			return nil, newCompileError(paths, output)
 		}
-		// Reduce the matches down to unique ones
-		missedPkgs := []string{}
-		for _, match := range matches {
-			found := false
-			for _, pkgName := range missedPkgs {
-				if match[1] == pkgName {
-					found = true
-					break
-				}
-			}
-			if !found {
-				missedPkgs = append(missedPkgs, match[1])
-			}
-		}
-
 		utils.Logger.Warn("Detected missing packages, importing them", "packages", len(matches))
-		for _, pkgName := range missedPkgs {
+		for _, match := range matches {
 			// Ensure we haven't already tried to go get it.
-
+			pkgName := match[1]
 			utils.Logger.Info("Trying to import ", "package", pkgName)
 			if _, alreadyTried := gotten[pkgName]; alreadyTried {
 				utils.Logger.Error("Failed to import ", "package", pkgName)
@@ -250,7 +235,7 @@ func Build(c *model.CommandConfig, paths *model.RevelContainer) (_ *App, err err
 			}
 			gotten[pkgName] = struct{}{}
 			if err := c.PackageResolver(pkgName); err != nil {
-				//				panic("failed to resolve")
+				panic("failed to resolve")
 				utils.Logger.Error("Unable to resolve package", "package", pkgName, "error", err)
 				return nil, newCompileError(paths, []byte(err.Error()))
 			}

version.go

@@ -6,10 +6,10 @@ package cmd
 
 const (
 	// Version current Revel version
-	Version = "1.1.2"
+	Version = "1.2.0-dev"
 
 	// BuildDate latest commit/release date
-	BuildDate = "2022-04-12"
+	BuildDate = "2022-04-11"
 
 	// MinimumGoVersion minimum required Go version for Revel
 	MinimumGoVersion = ">= go1.17"