Skip to content

Commit

Permalink
Merge branch 'master' into stable
Browse files Browse the repository at this point in the history
  • Loading branch information
claeis committed Jan 23, 2023
2 parents 62cfa8b + 798ba53 commit 6e495d6
Show file tree
Hide file tree
Showing 2 changed files with 65 additions and 4 deletions.
58 changes: 56 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ allprojects {
compileJava.options.encoding = 'US-ASCII'
}

version '1.13.0'+System.getProperty('release','-SNAPSHOT')
version '1.13.1'+System.getProperty('release','-SNAPSHOT')

configurations {
deployerJars
Expand All @@ -24,7 +24,7 @@ configurations {
dependencies {
compile group: 'ch.ehi', name: 'ehibasics', version: '1.4.1'
compile group: 'ch.interlis', name: 'iox-api', version: '1.0.4'
compile group: 'ch.interlis', name: 'iox-ili', version: '1.21.15'
compile group: 'ch.interlis', name: 'iox-ili', version: '1.21.16'
compile group: 'ch.interlis', name: 'ili2c-tool', version: "5.3.2"
compile group: 'ch.interlis', name: 'ili2c-core', version: "5.3.2"
testCompile group: 'junit', name: 'junit', version: '4.12'
Expand Down Expand Up @@ -56,6 +56,7 @@ def downloads_pwd = System.getProperty('downloads_pwd',properties.get('downloads
def downloads_usr = System.getProperty('downloads_usr',properties.get('downloads_usr','downloads_usr'))
def python= System.getProperty('python',properties.get('python','python'))
def rst2html= System.getProperty('rst2html',properties.get('rst2html','rst2html'))
def github_token= System.getProperty('github_token',properties.get('github_token','github_token'))

def generatedResources = "$buildDir/generated-resources/main"

Expand Down Expand Up @@ -107,6 +108,58 @@ task generateMyResources {
}
}

def readChangeLog = { ->
def resp=""
def skip=false
def sec=0
new File("docs/CHANGELOG.txt").eachLine { line ->
if(line.startsWith("-------")){
sec++
}else{
if(sec==1){
if(skip){
}else{
if(line.trim()==""){
skip=true
}else{
resp+=line+"\n"
}
}
}
}
}
return resp
}
task readChanges {
doLast {
logger.quiet "----"
logger.quiet readChangeLog()
logger.quiet "----"
}
}
def createGithubReleaseFunc = { ->
def body = [tag_name:"$project.name-$project.version",name:"$project.name-$project.version",body:readChangeLog(),draft:false,prerelease:false,generate_release_notes:false]
def req = new URL("https://api.github.com/repos/claeis/$project.name/releases").openConnection()
req.setRequestMethod("POST")
req.setRequestProperty("Content-Type", "application/json; charset=UTF-8")
req.setRequestProperty("Accept", "application/vnd.github+json")
req.setRequestProperty("Authorization", "Bearer $github_token")
req.setRequestProperty("X-GitHub-Api-Version", "2022-11-28")
req.setDoOutput(true)
req.getOutputStream().write(groovy.json.JsonOutput.toJson(body).getBytes("UTF-8"))
if(req.getResponseCode()!=201){
logger.quiet "Status code: ${req.getResponseCode()}" // HTTP request done on first read
def resp = new groovy.json.JsonSlurper().parseText(req.getInputStream().getText())
logger.quiet "Response: ${resp}"
}
return
}
task createGithubRelease {
doLast {
createGithubReleaseFunc()
}
}

task usrdoc(type:Exec) {
group = JavaBasePlugin.DOCUMENTATION_GROUP
description = 'Builds the user documentation (html)'
Expand Down Expand Up @@ -193,5 +246,6 @@ task uploadBin(dependsOn: bindist) {
include(name: releaseFile.name)
}
}
createGithubReleaseFunc()
}
}
11 changes: 9 additions & 2 deletions docs/CHANGELOG.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
LATEST VERSION
-----------------------------
ilivalidator 1.13.1 (2023-01-23)
--------------------------------
- ILI2.4 support LIST OF / BAG OF primitive type (#348)
- ILI2.4 Vereinfachung des Umgangs mit Zeit (#349)
- ILI2.4 MULTI-Geometrien (#347)
- ILI2.4 validate MultiArea/MultiSurface topology (#347)
- A TRANSLATION OF model must not define new types, but only an alternative transfer format (#361)
- skip polygon topology validation if basic checks fail
- iox-ili-1.21.16

ilivalidator 1.13.0 (2022-12-30)
-----------------------------
Expand Down

0 comments on commit 6e495d6

Please sign in to comment.