Skip to content

Commit

Permalink
updated build number for github package repository test push
Browse files Browse the repository at this point in the history
  • Loading branch information
osmanj committed Sep 22, 2019
1 parent 1658635 commit fee271b
Show file tree
Hide file tree
Showing 3 changed files with 51 additions and 59 deletions.
40 changes: 20 additions & 20 deletions .project
Original file line number Diff line number Diff line change
@@ -1,25 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<filteredResources>
<filter>
<id>1446217534092</id>
<name/>
<type>26</type>
<matcher>
<id>org.eclipse.ui.ide.multiFilter</id>
<arguments>1.0-projectRelativePath-matches-false-false-build</arguments>
</matcher>
</filter>
<filter>
<id>1446217534094</id>
<name/>
<type>26</type>
<matcher>
<id>org.eclipse.ui.ide.multiFilter</id>
<arguments>1.0-projectRelativePath-matches-false-false-.gradle</arguments>
</matcher>
</filter>
</filteredResources>
<name>templar</name>
<comment>Templar templating engine</comment>
<projects/>
Expand All @@ -38,4 +18,24 @@
</buildCommand>
</buildSpec>
<linkedResources/>
<filteredResources>
<filter>
<id>1</id>
<type>26</type>
<name/>
<matcher>
<id>org.eclipse.ui.ide.multiFilter</id>
<arguments>1.0-projectRelativePath-matches-false-false-build</arguments>
</matcher>
</filter>
<filter>
<id>2</id>
<type>26</type>
<name/>
<matcher>
<id>org.eclipse.ui.ide.multiFilter</id>
<arguments>1.0-projectRelativePath-matches-false-false-.gradle</arguments>
</matcher>
</filter>
</filteredResources>
</projectDescription>
14 changes: 8 additions & 6 deletions .settings/org.eclipse.jdt.core.prefs
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
eclipse.preferences.version=1
#
#Fri Sep 20 15:22:18 AEST 2019
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.source=1.8
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=1.8
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.source=1.8
56 changes: 23 additions & 33 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,14 @@ plugins {
id 'eclipse'
id 'maven'
id 'maven-publish'
id 'net.saliman.cobertura' version '2.2.6'

id "com.github.ben-manes.versions" version "0.25.0"

id 'co.riiid.gradle' version '0.3.1'
id 'com.jfrog.bintray' version '1.4'

id 'synapticloop.documentr' version '2.8.2'
id 'synapticloop.copyrightr' version '1.1.2'
id 'synapticloop.documentr' version '3.0.0'
id 'synapticloop.copyrightr' version '1.3.1'
id "org.datlowe.maven-publish-auth" version "2.0.2"

id "synapticloop.projectFilestatistics" version "1.0.1"

Expand All @@ -20,16 +21,13 @@ plugins {
group = 'synapticloop'
archivesBaseName = 'templar'
description = """Templar templating engine"""
version = '1.4.4'
version = '1.4.5'

sourceCompatibility = 1.7
targetCompatibility = 1.7
sourceCompatibility = 1.8
targetCompatibility = 1.8

// tasks.withType(Javadoc).all { enabled = false }

cobertura {
coverageFormats = [ 'html', 'xml']
}

test {
include '**/*Test.class'
Expand All @@ -41,12 +39,14 @@ repositories {
mavenLocal()
mavenCentral()
jcenter()

maven{
url "https://maven.pkg.github.com/synapticloop"
}
}

dependencies {
runtime 'org.json:json:20160212'

compile 'org.json:json:20160212'
implementation 'org.json:json:20190722'

testRuntime 'junit:junit:4.11'
testRuntime 'org.mockito:mockito-all:1.10.19'
Expand Down Expand Up @@ -85,13 +85,6 @@ github {
]
}

def javaApiUrl = 'http://docs.oracle.com/javase/1.6.0/docs/api/'
def groovyApiUrl = 'http://groovy.codehaus.org/gapi/'

tasks.withType(Javadoc) {
options.links(javaApiUrl, groovyApiUrl)
}

task javadocJar(type: Jar, dependsOn: javadoc) {
classifier = 'javadoc'
from 'build/docs/javadoc'
Expand All @@ -104,7 +97,7 @@ task sourcesJar(type: Jar) {

publishing {
publications {
Synapticloop(MavenPublication) {
synapticloop(MavenPublication) {
from components.java
artifact sourcesJar
artifact javadocJar
Expand All @@ -122,22 +115,19 @@ publishing {
}
}
}
}

bintray {
user = System.getenv('BINTRAY_USER')
key = System.getenv('BINTRAY_PASSWORD')

publications = [ 'Synapticloop' ]
repositories {
maven {
url "https://maven.pkg.github.com/synapticloop/templar"

publish = true

pkg {
repo = 'maven'
name = archivesBaseName
credentials {
username = System.getenv('GITHUB_PUBLISH_USER')
password = System.getenv('GITHUB_PUBLISH_TOKEN')
}
}
}

}

build.finalizedBy(project.tasks.shadowJar)

task(dist).dependsOn( [ 'test', 'cobertura'] )

0 comments on commit fee271b

Please sign in to comment.