Skip to content

Commit 793f9c9

Browse files
author
Holger Brandl
committed
backported to v1.4 additions
1 parent ca1df84 commit 793f9c9

File tree

4 files changed

+32
-7
lines changed

4 files changed

+32
-7
lines changed

LICENSE.txt

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
The MIT License (MIT)
2+
3+
Copyright (c) 2019 Holger Brandl
4+
5+
Permission is hereby granted, free of charge, to any person obtaining a copy
6+
of this software and associated documentation files (the "Software"), to deal
7+
in the Software without restriction, including without limitation the rights
8+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
copies of the Software, and to permit persons to whom the Software is
10+
furnished to do so, subject to the following conditions:
11+
12+
The above copyright notice and this permission notice shall be included in all
13+
copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21+
SOFTWARE.

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ java {
3434

3535

3636
group = 'com.github.holgerbrandl'
37-
version = '1.2'
37+
version = '1.4'
3838

3939

4040
publishing {

dev_notes.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
```bash
44
# cd /d/projects/misc/kscript-annotations
55

6-
./gradlew install
6+
./gradlew jar
77

88
./gradlew publishToMavenLocal
99

src/main/kotlin/ScriptDirectives.kt

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,15 @@ annotation class CompilerOpts(val kotlincFlags: String)
4545
@Repeatable
4646
annotation class DependsOnMaven(val artifactLocator: String)
4747

48+
/**
49+
* Declare a maven repository that will be used by kscript to resolve dependencies
50+
*
51+
* @param id A user-defined name for this repository
52+
* @param url The endpoint under which maven will find the repo
53+
* @param user Optional user name
54+
* @param password Optional password (required if user is defined)
55+
*/
4856
@Target(AnnotationTarget.FILE)
4957
@Retention(AnnotationRetention.SOURCE)
5058
@Repeatable
51-
// in contrast to the original version we make the id mandatory here.
52-
// This keeps ensures compatiblity with keplin but eases parsing
53-
//annotation class MavenRepository(val id: String = "", val url: String)
54-
annotation class MavenRepository(val id: String, val url: String)
55-
59+
annotation class MavenRepository(val id: String, val url: String, val user: String = "", val password: String = "")

0 commit comments

Comments
 (0)