Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#
# https://help.github.com/articles/dealing-with-line-endings/
#
# Linux start script should use lf
/gradlew text eol=lf

# These are Windows script files and should use crlf
*.bat text eol=crlf

9 changes: 8 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,13 @@ mongo.log
# IDE
.vscode
.idea
.project

# OS
.DS_Store
.DS_Store

# Ignore Gradle project-specific cache directory
.gradle

# Ignore Gradle build output directory
build
8 changes: 7 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,13 @@ compile:

kb-sdk compile $(SPEC_FILE) \
--out . \
--html \
--html

kb-sdk compile $(SPEC_FILE) \
--out . \
--java \
--url https://ci.kbase.us/services/sampleservice \
--javasrc src/main/java

test: test-sdkless coverage-reports

Expand Down
4 changes: 3 additions & 1 deletion RELEASE_NOTES.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
# SampleService release notes

## Unreleased
## 0.2.6

* Added jitpack build for Java client

## 0.2.5

Expand Down
64 changes: 64 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
/*
* This file was generated by the Gradle 'init' task.
*/

plugins {
id 'java'
id 'maven-publish'
}

group = 'com.github.kbase'

var VER_AUTH2_CLIENT = "0.5.0"
var VER_JAVA_COMMON = "0.3.0"

repositories {
mavenCentral()
maven {
name = "JitPack"
url = 'https://jitpack.io'
}
}

compileJava {
// TODO BUILD remove when we no longer support java 8, use `options.release = 11 if necessary`
java.sourceCompatibility = JavaVersion.VERSION_1_8
java.targetCompatibility = JavaVersion.VERSION_1_8
}

java {
withSourcesJar()
withJavadocJar()
}

javadoc {
/* TODO DOCS the current sdk documenation looks like invalid html to javadoc
* need to go through and remove
*/
failOnError = false
options {
// I don't know why this isn't working, but it's not worth spending time on right now
links "https://docs.oracle.com/javase/8/docs/api/"
links "https://javadoc.jitpack.io/com/github/kbase/auth2_client_java/$VER_AUTH2_CLIENT/javadoc/"
links "https://javadoc.jitpack.io/com/github/kbase/java_common/$VER_JAVA_COMMON/javadoc/"
}
}

publishing {
publications {
maven(MavenPublication) {
from components.java
}
}
}

dependencies {

// using older dependencies to not force upgrades on services that might not be able to
// handle them. Need to upgrade the services and then upgrade here
implementation "com.github.kbase:java_common:$VER_JAVA_COMMON"
implementation "com.fasterxml.jackson.core:jackson-databind:2.5.4"
implementation "com.github.kbase:auth2_client_java:$VER_AUTH2_CLIENT"
implementation 'javax.annotation:javax.annotation-api:1.3.2'

}
2 changes: 2 additions & 0 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# This file was generated by the Gradle 'init' task.
# https://docs.gradle.org/current/userguide/platforms.html#sub::toml-dependencies-format
Binary file added gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
7 changes: 7 additions & 0 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
249 changes: 249 additions & 0 deletions gradlew

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion kbase.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ service-language:
python

module-version:
0.2.5
0.2.6

owners:
[gaprice, slebras]
Expand Down
6 changes: 3 additions & 3 deletions lib/SampleService/SampleServiceImpl.py
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,9 @@ class SampleService:
# state. A method could easily clobber the state set by another while
# the latter method is running.
######################################### noqa
VERSION = "0.2.5"
GIT_URL = "git@github.com:kbase/sample_service.git"
GIT_COMMIT_HASH = "b7e68b5768795d77287d8ea6d67d32b21ae34cf9"
VERSION = "0.2.6"
GIT_URL = "https://github.com/kbase/sample_service.git"
GIT_COMMIT_HASH = "0fb836e801f78a42aab2b3be7c00013946fb1038"

#BEGIN_CLASS_HEADER
#END_CLASS_HEADER
Expand Down
Loading