Skip to content

Commit

Permalink
1.0.1
Browse files Browse the repository at this point in the history
* Add spinner icon
* Convert lambdas on page to extension functions
* Add StatusPage usage
  • Loading branch information
pambrose authored Apr 24, 2020
1 parent 6ae0222 commit 877e46b
Show file tree
Hide file tree
Showing 15 changed files with 828 additions and 623 deletions.
8 changes: 8 additions & 0 deletions .codeclimate.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
engines:
checkstyle:
enabled: true
channel: "beta"

ratings:
paths:
- "**.java"
20 changes: 20 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
language: java

jdk:
#- openjdk8
#- oraclejdk11
- openjdk11

before_script:
- chmod +x gradlew

script:
- ./gradlew check #jacocoTestReport

#after_success:
# - bash <(curl -s https://codecov.io/bash)
# - ./gradlew jacocoTestReport coveralls

notifications:
email:
- [email protected]
3 changes: 0 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,6 @@ uberjar:
uber: uberjar
java -jar build/libs/server.jar

heroku:
git push heroku master

tests:
./gradlew check

Expand Down
1 change: 0 additions & 1 deletion Procfile

This file was deleted.

6 changes: 6 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# ReadingBat Core

[![](https://jitpack.io/v/readingbat/readingbat-core.svg)](https://jitpack.io/#readingbat/readingbat-core)
[![Build Status](https://travis-ci.org/readingbat/readingbat-core.svg?branch=master)](https://travis-ci.org/readingbat/readingbat-core)
[![Codacy Badge](https://api.codacy.com/project/badge/Grade/ed84149dc1f141ed838d9a53c1c6fe3a)](https://www.codacy.com/gh/readingbat/readingbat-site?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=readingbat/readingbat-site&amp;utm_campaign=Badge_Grade)
[![Kotlin](https://img.shields.io/badge/%20language-Kotlin-red.svg)](https://kotlinlang.org/)
33 changes: 30 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ plugins {
id 'java'
id 'org.jetbrains.kotlin.jvm' version '1.3.71'
id "com.github.ben-manes.versions" version "0.28.0"
id 'com.github.johnrengelman.shadow' version '5.2.0'
}

repositories {
Expand All @@ -13,6 +14,9 @@ repositories {
maven { url = 'https://jitpack.io' }
}

def mainName = 'com.github.readingbat.Main'
def appName = 'server'

def flexmarkVersion = '0.61.0'
def junitVersion = '5.6.1'
def kluentVersion = '1.60'
Expand All @@ -25,8 +29,8 @@ sourceCompatibility = 1.8
targetCompatibility = 1.8

description = 'ReadingBat Core'
group 'com.github.pambrose.readingbat'
version '1.0.0'
group 'com.github.readingbat'
version '1.0.1'

sourceSets {
main.kotlin.srcDirs = main.java.srcDirs = ['src']
Expand Down Expand Up @@ -70,6 +74,26 @@ artifacts {
archives sourcesJar
}

// Include build uberjars in heroku deploy
task stage(dependsOn: ['uberjar', 'build', 'clean'])
build.mustRunAfter clean

shadowJar {
mergeServiceFiles()
}

task uberjar(type: Jar, dependsOn: shadowJar) {
archiveFileName = 'server.jar'
manifest {
attributes('Implementation-Title': appName)
attributes('Implementation-Version': version)
attributes('Built-Date': new Date())
attributes('Built-JDK': System.getProperty('java.version'))
attributes('Main-Class': mainName)
}
from zipTree(shadowJar.archiveFile)
}

compileKotlin {
kotlinOptions.jvmTarget = '1.8'
kotlinOptions.freeCompilerArgs += ['-Xuse-experimental=kotlin.time.ExperimentalTime',
Expand All @@ -80,7 +104,10 @@ compileKotlin {

compileTestKotlin {
kotlinOptions.jvmTarget = '1.8'
kotlinOptions.freeCompilerArgs += ['-Xuse-experimental=kotlin.time.ExperimentalTime']
kotlinOptions.freeCompilerArgs += ['-Xuse-experimental=kotlin.time.ExperimentalTime',
'-Xuse-experimental=kotlinx.serialization.UnstableDefault',
'-Xuse-experimental=io.ktor.util.KtorExperimentalAPI',
"-XXLanguage:+InlineClasses"]
}

test {
Expand Down
Loading

0 comments on commit 877e46b

Please sign in to comment.