Skip to content

Commit

Permalink
Updates dependency versions
Browse files Browse the repository at this point in the history
  • Loading branch information
cjbrooks12 committed Jul 27, 2019
1 parent 9f1c617 commit e572f37
Show file tree
Hide file tree
Showing 7 changed files with 39 additions and 33 deletions.
29 changes: 9 additions & 20 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,19 +1,16 @@
buildscript {
ext.kotlin_version = '1.3.31'
ext.serialization_version = '0.11.0'

repositories {
jcenter()
maven { url "https://plugins.gradle.org/m2/" }
maven { url "https://kotlin.bintray.com/kotlinx" }
}

dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
classpath 'com.github.jengelman.gradle.plugins:shadow:5.0.0'
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
classpath "de.fayard:buildSrcVersions:0.3.2"
classpath(Libs.kotlin_gradle_plugin)
classpath(Libs.kotlin_serialization)
classpath(Libs.shadow)
classpath(Libs.gradle_bintray_plugin)
classpath(Libs.buildsrcversions)
}
}

Expand All @@ -22,14 +19,6 @@ apply plugin: "de.fayard.buildSrcVersions"
group 'com.eden'
version '0.2.3'

allprojects {
repositories {
jcenter()
maven { url "https://kotlin.bintray.com/kotlinx" }
maven { url 'https://jitpack.io' }
}
}

// Config Values
//----------------------------------------------------------------------------------------------------------------------

Expand All @@ -41,11 +30,11 @@ ext.ossLicenses = [
]

ext {
group = 'com.eden'
group = 'com.eden.kodiak'
github_project = 'copper-leaf/kodiak'

// Orchid
orchid_version = '0.16.10'
orchid_version = '0.17.1'
orchid_theme = 'Copper'
base_url = 'https://copper-leaf.github.io/kodiak'
github_token = project.hasProperty("github_token") ? project.property("github_token") : System.getenv('GITHUB_TOKEN')
Expand All @@ -68,8 +57,8 @@ ext {
developer_email = '[email protected]'

// Project info
project_name = 'Json Docs'
project_description = 'Wrappers around code documentation tools to produce JSON models as libraries'
project_name = 'Kodiak'
project_description = 'Wrappers around code documentation CLI tools to produce JSON models, usable as libraries'

license = rootProject.ext.ossLicenses['BSD']
}
21 changes: 10 additions & 11 deletions buildSrc/src/main/kotlin/Versions.kt
Original file line number Diff line number Diff line change
Expand Up @@ -11,41 +11,40 @@ object Versions {

const val com_eden_common: String = "1.11.4"

const val shadow: String = "5.0.0"
const val shadow: String = "5.1.0"

const val gradle_bintray_plugin: String = "1.8.4"

const val buildsrcversions: String = "0.3.2"

const val io_github_javaeden_orchid: String = "0.17.1"

const val strikt_core: String = "0.20.1"
const val strikt_core: String = "0.21.1"

const val groovy_all: String = "2.5.7"

const val dokka_fatjar: String = "0.9.18"
const val dokka_fatjar: String = "0.9.18"

const val org_jetbrains_kotlin: String = "1.3.31"
const val org_jetbrains_kotlin: String = "1.3.41"

const val kotlinx_serialization_runtime: String = "0.11.0"
// available: "0.11.1-1.3.40-eap-107"
const val kotlinx_serialization_runtime: String = "0.11.0" // available: "0.11.2-1.3.50-eap-5"

const val jsoup: String = "1.12.1"

const val org_junit_jupiter: String = "5.4.2"
const val org_junit_jupiter: String = "5.5.1"

/**
*
* To update Gradle, edit the wrapper file at path:
* ./gradle/wrapper/gradle-wrapper.properties
*/
object Gradle {
const val runningVersion: String = "5.4.1"
const val runningVersion: String = "5.5.1"

const val currentVersion: String = "5.4.1"
const val currentVersion: String = "5.5.1"

const val nightlyVersion: String = "5.6-20190615000035+0000"
const val nightlyVersion: String = "5.7-20190726220034+0000"

const val releaseCandidate: String = "5.5-rc-3"
const val releaseCandidate: String = ""
}
}
2 changes: 1 addition & 1 deletion docs/src/orchid/resources/config.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
site:
about:
siteName: Kodiak
siteDescription: A collection wrappers around various code documentation tools which produces a common JSON output readable by Orchid.
siteDescription: Wrappers around code documentation CLI tools to produce JSON models, usable as libraries

theme:
social:
Expand Down
6 changes: 6 additions & 0 deletions gradle/groups/formatters.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,12 @@ version rootProject.version

sourceCompatibility = 1.8

repositories {
jcenter()
maven { url "https://kotlin.bintray.com/kotlinx" }
maven { url 'https://jitpack.io' }
}

dependencies {
api(Libs.com_eden_common)
api(Libs.clog4j)
Expand Down
6 changes: 6 additions & 0 deletions gradle/groups/models.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,12 @@ version rootProject.version

sourceCompatibility = 1.8

repositories {
jcenter()
maven { url "https://kotlin.bintray.com/kotlinx" }
maven { url 'https://jitpack.io' }
}

dependencies {
compile(Libs.kotlin_stdlib_jdk8)
compile(Libs.kotlin_reflect)
Expand Down
6 changes: 6 additions & 0 deletions gradle/groups/runners.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,12 @@ version rootProject.version

sourceCompatibility = 1.8

repositories {
jcenter()
maven { url "https://kotlin.bintray.com/kotlinx" }
maven { url 'https://jitpack.io' }
}

dependencies {
compile project(":common:common-models")

Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-5.5.1-all.zip

0 comments on commit e572f37

Please sign in to comment.