Skip to content

Commit

Permalink
fix versions for circleci
Browse files Browse the repository at this point in the history
  • Loading branch information
GladeDiviney committed Aug 9, 2024
1 parent 14bb898 commit 30010b1
Show file tree
Hide file tree
Showing 12 changed files with 252 additions and 224 deletions.
12 changes: 7 additions & 5 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: 2
jobs:
build:
docker:
- image: circleci/openjdk:8-jdk
- image: cimg/openjdk:8.0.402

working_directory: ~/repo

Expand All @@ -24,13 +24,15 @@ jobs:
- v1-dependencies-{{ checksum "build.gradle" }}-{{ checksum ".circleci/config.yml" }}
- v1-dependencies-

- run:
name: Update SonarQube
command: gradle sonarqube -Dsonar.projectKey=gladed_watchable -Dsonar.organization=gladed-github -Dsonar.host.url=https://sonarcloud.io -Dsonar.login=$SONAR_LOGIN
# TODO #101: Restore this
# README: [![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=gladed_watchable&metric=alert_status)](https://sonarcloud.io/dashboard?id=gladed_watchable)
# - run:
# name: Update SonarQube
# command: gradle sonarqube -Dsonar.projectKey=gladed_watchable -Dsonar.organization=gladed-github -Dsonar.host.url=https://sonarcloud.io -Dsonar.login=$SONAR_LOGIN

- run:
name: Build and test
command: gradle detekt check
command: gradle detekt check --info --stacktrace

- run:
name: Update codecov.io
Expand Down
4 changes: 1 addition & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
[![Download](https://api.bintray.com/packages/gladed/watchable/watchable/images/download.svg?version=0.6.22)](https://bintray.com/gladed/watchable/watchable/0.6.22/link)
[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=gladed_watchable&metric=alert_status)](https://sonarcloud.io/dashboard?id=gladed_watchable)
[![CircleCI](https://circleci.com/gh/gladed/watchable.svg?style=svg)](https://circleci.com/gh/gladed/watchable)
[![CodeCov](https://codecov.io/github/gladed/watchable/coverage.svg?branch=master)](https://codecov.io/github/gladed/watchable)
[![detekt](https://img.shields.io/badge/code%20style-%E2%9D%A4-FF4081.svg)](https://arturbosch.github.io/detekt/)
[![detekt](https://img.shields.io/badge/code%20style-%E2%9D%A4-FF4081.svg)](https://github.com/detekt/detekt)
[![Kotlin](https://img.shields.io/badge/Kotlin-1.4.10-blue.svg)](https://kotlinlang.org/)
[![API Docs](https://img.shields.io/badge/API_Docs-latest-purple.svg)](https://gladed.github.io/watchable/latest/watchable/)

Expand Down
35 changes: 8 additions & 27 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
buildscript {
ext {
detekt_version = '1.14.2' // Must match plugin ID below
dokka_version = '1.4.10'
detekt_version = '1.16.0' // Must match plugin ID below
dokka_version = '1.9.20'
jvm_version = '1.8'
kotlin_coroutines_version = '1.4.0'
kotlin_version = '1.4.10'
Expand All @@ -11,7 +11,6 @@ buildscript {

repositories {
mavenCentral()
jcenter()
maven {
url = 'https://plugins.gradle.org/m2/'
}
Expand All @@ -24,10 +23,9 @@ buildscript {
}

plugins {
id "com.github.hierynomus.license" version "0.15.0"
id "io.gitlab.arturbosch.detekt" version "1.14.2"
id "com.github.hierynomus.license" version "0.16.1"
id "io.gitlab.arturbosch.detekt" version "1.16.0"
id "org.sonarqube" version "2.7"
id "com.jfrog.bintray" version "1.8.4"
id "maven-publish"
}

Expand All @@ -44,7 +42,7 @@ description = "Listenable data structures using Kotlin coroutines"

repositories {
mavenCentral()
jcenter()
maven { url "https://maven.pkg.jetbrains.space/public/p/kotlinx-html/maven" }
}

dependencies {
Expand All @@ -70,12 +68,13 @@ tasks.withType(JavaCompile) {
compileKotlin.kotlinOptions {
allWarningsAsErrors = true
jvmTarget = "$ext.jvm_version"
freeCompilerArgs += ["-Xuse-experimental=kotlin.Experimental"]
freeCompilerArgs += ["-Xuse-experimental=kotlin.Experimental", "-Xopt-in=kotlin.RequiresOptIn"]
}

compileTestKotlin.kotlinOptions {
jvmTarget = "$ext.jvm_version"
freeCompilerArgs += ["-Xuse-experimental=kotlin.Experimental"]
freeCompilerArgs += ["-Xuse-experimental=kotlin.Experimental", "-Xopt-in=kotlin.RequiresOptIn"]

}

test {
Expand Down Expand Up @@ -154,24 +153,6 @@ artifacts {
archives javadocJar
}

bintray {
user = project.properties['bintray.user']
key = project.properties['bintray.key']
publications = ['mavenPublication']
pkg {
repo = project.name
name = project.name
userOrg = 'gladed'
licenses = [ 'Apache-2.0' ]
vcsUrl = 'https://github.com/gladed/watchable.git'
version {
name = project.version
desc = project.version
released = new Date()
}
}
}

publishing {
publications {
mavenPublication(MavenPublication) {
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Fri Oct 14 14:13:22 PDT 2016
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.4-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
Loading

0 comments on commit 30010b1

Please sign in to comment.