Skip to content

Commit

Permalink
Merge pull request #1960 from dhis2/1.8.0-rc-pr
Browse files Browse the repository at this point in the history
feat: [1.8.0-RC] Version 1.8.0
  • Loading branch information
vgarciabnz authored May 9, 2023
2 parents b5591b5 + e911fc1 commit 154943b
Show file tree
Hide file tree
Showing 3,071 changed files with 27,844 additions and 16,019 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
2 changes: 1 addition & 1 deletion .idea/scopes/copyright.xml

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

2 changes: 2 additions & 0 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,8 @@ pipeline {
expression { env.CHANGE_ID == null }
anyOf {
expression { env.GIT_BRANCH == "master" }
expression { env.GIT_BRANCH == "develop" }
expression { env.GIT_BRANCH ==~ /[0-9]+\.[0-9]+\.[0-9]+-rc/ }
}
}
}
Expand Down
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
# DHIS2 Android SDK

[![Build Status](https://api.travis-ci.com/dhis2/dhis2-android-sdk.svg?branch=master)](https://travis-ci.com/dhis2/dhis2-android-sdk)
[![Maven Central](https://maven-badges.herokuapp.com/maven-central/org.hisp.dhis/android-core/badge.svg)](https://maven-badges.herokuapp.com/maven-central/org.hisp.dhis/android-core)
[![Coverage](https://sonarcloud.io/api/project_badges/measure?project=dhis2_dhis2-android-sdk&metric=coverage&branch=master)](https://sonarcloud.io/summary/new_code?id=dhis2_dhis2-android-sdk&branch=master)
[![Lines of Code](https://sonarcloud.io/api/project_badges/measure?project=dhis2_dhis2-android-sdk&metric=ncloc&branch=master)](https://sonarcloud.io/summary/new_code?id=dhis2_dhis2-android-sdk&branch=master)

## Introduction

Expand Down
71 changes: 0 additions & 71 deletions build.gradle

This file was deleted.

77 changes: 77 additions & 0 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
import org.jlleitschuh.gradle.ktlint.reporter.ReporterType

buildscript {
val kotlinVersion = "1.7.21"

repositories {
google()
mavenLocal()
mavenCentral()
maven(url = "https://plugins.gradle.org/m2/")
}

dependencies {
classpath("com.android.tools.build:gradle:7.4.1")
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlinVersion}")
classpath("org.jlleitschuh.gradle:ktlint-gradle:11.0.0")
classpath("org.jacoco:org.jacoco.core:0.8.8")
}
}

plugins {
id("org.sonarqube") version "3.3"
}

sonarqube {
properties {
val branch = System.getenv("GIT_BRANCH")
val targetBranch = System.getenv("GIT_BRANCH_DEST")
val pullRequestId = System.getenv("PULL_REQUEST")

property("sonar.projectKey", "dhis2_dhis2-android-sdk")
property("sonar.organization", "dhis2")
property("sonar.host.url", "https://sonarcloud.io")
property("sonar.projectName", "dhis2-android-sdk")

if (pullRequestId == null) {
property("sonar.branch.name", branch)
} else {
property("sonar.pullrequest.base", targetBranch)
property("sonar.pullrequest.branch", branch)
property("sonar.pullrequest.key", pullRequestId)
}
}
}

allprojects {
repositories {
maven(url = "https://maven.google.com")
maven(url = "https://oss.sonatype.org/content/repositories/snapshots")
google()
mavenCentral()
maven(url = "https://maven.pkg.jetbrains.space/public/p/kotlinx-html/maven")
maven(url = "https://jitpack.io")
}
}

tasks.register("clean", Delete::class) {
delete(rootProject.buildDir)
}


subprojects {
apply(plugin = "org.jlleitschuh.gradle.ktlint")

//group = GROUP
//version = VERSION_NAME

configure<org.jlleitschuh.gradle.ktlint.KtlintExtension> {
version.set("0.45.2")
android.set(true)
outputColorName.set("RED")
reporters {
reporter(ReporterType.PLAIN)
reporter(ReporterType.CHECKSTYLE)
}
}
}
Loading

0 comments on commit 154943b

Please sign in to comment.