From 0fdcc78daebfa1ed267d94d115afbffe179161ee Mon Sep 17 00:00:00 2001 From: Evan Tatarka Date: Mon, 20 Aug 2018 08:06:01 -0400 Subject: [PATCH] Fixed packaging issues Fixes #116, #119 --- CHANGELOG.md | 6 ++++++ build.gradle | 4 ++-- publish.gradle | 7 +++++++ 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3d29f4bf..8f241501 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). +## [0.12] - 2018-08-20 + +### Fixed +- Bumped the kotlin version to 1.2.50 to fix a packaging issue. +- Remove `pom` as it should be using the default jar packaging. + ## [0.11] - 2018-08-04 ### Added diff --git a/build.gradle b/build.gradle index 5660ca76..cc8424dd 100644 --- a/build.gradle +++ b/build.gradle @@ -1,10 +1,10 @@ allprojects { group 'com.willowtreeapps.assertk' - version '0.11' + version '0.12' } buildscript { - ext.kotlin_version = '1.2.41' + ext.kotlin_version = '1.2.50' ext.dokka_version = '0.9.16' ext.detekt_version = '1.0.0.RC5' diff --git a/publish.gradle b/publish.gradle index eedc1323..bc86ea48 100644 --- a/publish.gradle +++ b/publish.gradle @@ -89,6 +89,13 @@ publishing { artifact sourcesJar artifact javadocsJar + pom.withXml { + // Remove pom as it should be the default jar + def children = asNode().children() + def versionIndex = children.indexOf(children.find {it.name().localPart == 'packaging'}) + children.remove(versionIndex) + } + if (signing.required) { // Sign the artifacts. project.tasks.signArchives.signatureFiles.each {