Skip to content

Commit a7047e5

Browse files
author
JeanMarc van Leerdam
committed
Refresh references to existing resource group and storage account; update extensionbundle requirement
1 parent 39a94b0 commit a7047e5

File tree

6 files changed

+15
-16
lines changed

6 files changed

+15
-16
lines changed

README.md

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@ in your `build.sbt` provide values for the assembly and azure-functions plugins:
6363

6464

6565
## TODO:
66-
1. add task to upload to Azure
6766
1. add support for App Insights workspaces
6867
1. add tests against multiple Java versions (java 8 and Java 11)
6968

@@ -75,19 +74,19 @@ released for different scala versions and different sbt versions. I have not (ye
7574
what Scala version is used for each sbt release, except for https://github.com/sbt/sbt/issues/5032,
7675
so I am also keeping track here:
7776

78-
| SBT release(s)| Scala version | Remarks |
79-
|---------------|-------------------|--------------------------------------------------|
80-
| 0.x | 2.10.x |
81-
| 1.x | 2.12.x |
82-
| 2.x | 2.13.x or 3.0.x |
83-
| 3.x | 3.0.x or 3.1.x |
77+
| SBT release(s) | Scala version | Remarks |
78+
|-----------------|-----------------|---------|
79+
| 0.x | 2.10.x | |
80+
| 1.x | 2.12.x | |
81+
| 2.x | 2.13.x or 3.0.x | |
82+
| 3.x | 3.0.x or 3.1.x | |
8483

8584
For now, I will focus only on sbt 1.x and Scala 2.12.x
8685

8786
### Microsoft Azure Dependencies
8887
This plugin uses artifacts from Microsoft:
89-
* "com.microsoft.azure" % "azure-tools-common" % "0.10.0"
90-
* "com.microsoft.azure.functions" % "azure-functions-java-library" % "1.3.1" % "test"
88+
* `"com.microsoft.azure" % "azure-tools-common" % "0.10.0"`
89+
* `"com.microsoft.azure.functions" % "azure-functions-java-library" % "1.3.1" % "test"`
9190

9291
For now I will use these versions
9392

plugin/src/sbt-test/sbt-azure-functions/deploy/build.sbt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ lazy val root = (project in file("."))
1010
assembly / assemblyJarName := "ScalaFunctions.jar",
1111
azfunFunctionAppName := "rd-scala-functions",
1212
azfunLocation := "westeurope",
13-
azfunResourceGroup := "rg-rd-scala-functions",
14-
azfunStorageAccount := "a77a749630954151919e"
13+
azfunResourceGroup := "rg-function-showcase",
14+
azfunStorageAccount := "rgfunctionshowcasebaa9"
1515
)

plugin/src/sbt-test/sbt-azure-functions/deploy/host.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
"version": "2.0",
33
"extensionBundle": {
44
"id": "Microsoft.Azure.Functions.ExtensionBundle",
5-
"version": "[1.*, 2.0.0)"
5+
"version": "[2.*, 3.0.0)"
66
}
77
}

plugin/src/sbt-test/sbt-azure-functions/simple/build.sbt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ lazy val root = (project in file("."))
1010
assembly / assemblyJarName := "ScalaFunctions.jar",
1111
azfunFunctionAppName := "rd-scala-functions",
1212
azfunLocation := "westeurope",
13-
azfunResourceGroup := "rg-rd-scala-functions",
14-
azfunStorageAccount := "a77a749630954151919e"
13+
azfunResourceGroup := "rg-function-showcase",
14+
azfunStorageAccount := "rgfunctionshowcasebaa9"
1515
)

plugin/src/sbt-test/sbt-azure-functions/simple/host.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
"version": "2.0",
33
"extensionBundle": {
44
"id": "Microsoft.Azure.Functions.ExtensionBundle",
5-
"version": "[1.*, 2.0.0)"
5+
"version": "[2.*, 3.0.0)"
66
}
77
}

showcase/host.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
"version": "2.0",
33
"extensionBundle": {
44
"id": "Microsoft.Azure.Functions.ExtensionBundle",
5-
"version": "[1.*, 2.0.0)"
5+
"version": "[2.*, 3.0.0)"
66
}
77
}

0 commit comments

Comments
 (0)