Skip to content

Commit

Permalink
Merge pull request #120 from willowtreeapps/packaging-fixes
Browse files Browse the repository at this point in the history
Fixed packaging issues
  • Loading branch information
evant authored Aug 20, 2018
2 parents 7dd52b4 + 0fdcc78 commit ef171bc
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 2 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 `<packaging>pom</packaging>` as it should be using the default jar packaging.

## [0.11] - 2018-08-04

### Added
Expand Down
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -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'

Expand Down
7 changes: 7 additions & 0 deletions publish.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,13 @@ publishing {
artifact sourcesJar
artifact javadocsJar

pom.withXml {
// Remove <packaging>pom</packaging> 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 {
Expand Down

0 comments on commit ef171bc

Please sign in to comment.