Remove deprecation from importFile param

Author: rsora

cli/upload/upload.go

@@ -36,6 +36,7 @@ var (
 	verbose        bool
 	verify         bool
 	importDir      string
+	importFile     string
 	programmer     string
 	burnBootloader bool
 )
@@ -54,6 +55,7 @@ func NewCommand() *cobra.Command {
 	uploadCommand.Flags().StringVarP(&fqbn, "fqbn", "b", "", "Fully Qualified Board Name, e.g.: arduino:avr:uno")
 	uploadCommand.Flags().StringVarP(&port, "port", "p", "", "Upload port, e.g.: COM10 or /dev/ttyACM0")
 	uploadCommand.Flags().StringVarP(&importDir, "input-dir", "", "", "Directory containing binaries to upload.")
+	uploadCommand.Flags().StringVarP(&importDir, "input-file", "", "", "Binary file to upload.")
 	uploadCommand.Flags().BoolVarP(&verify, "verify", "t", false, "Verify uploaded binary after the upload.")
 	uploadCommand.Flags().BoolVarP(&verbose, "verbose", "v", false, "Optional, turns on verbose mode.")
 	uploadCommand.Flags().StringVarP(&programmer, "programmer", "P", "", "Optional, use the specified programmer to upload or 'list' to list supported programmers.")
@@ -97,6 +99,7 @@ func run(command *cobra.Command, args []string) {
 			Port:       port,
 			Verbose:    verbose,
 			Verify:     verify,
+			ImportFile: importFile,
 			ImportDir:  importDir,
 			Programmer: programmer,
 		}, os.Stdout, os.Stderr); err != nil {
@@ -113,6 +116,7 @@ func run(command *cobra.Command, args []string) {
 		Port:       port,
 		Verbose:    verbose,
 		Verify:     verify,
+		ImportFile: importFile,
 		ImportDir:  importDir,
 		Programmer: programmer,
 	}, os.Stdout, os.Stderr); err != nil {

rpc/commands/commands.pb.go

@@ -39,7 +39,9 @@ message UploadReq {
 	// After upload, verify that the contents of the memory on the board match the
 	// uploaded binary.
 	bool verify = 6;
-	string import_file = 7 [deprecated = true]; // DEPRECATED: Use import_dir instead
+	// When `import_file` is specified, it overrides the `import_dir` and `sketch_path`
+	// params.
+	string import_file = 7;
 	// Custom path to a directory containing compiled files. When `import_dir` is
 	// not specified, the standard build directory under `sketch_path` is used.
 	string import_dir = 8;