Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 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
4 changes: 1 addition & 3 deletions dbinspector-no-op/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,10 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget

plugins {
id "com.android.library"
Comment thread
KCeh marked this conversation as resolved.
id "kotlin-android"
}

android {
compileSdkVersion buildConfig.compileSdk
buildToolsVersion buildConfig.buildTools

defaultConfig {
minSdkVersion buildConfig.minSdk
Expand All @@ -22,7 +20,7 @@ android {
}
release {
minifyEnabled true
proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.txt"
proguardFiles getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.txt"
}
}

Expand Down
4 changes: 1 addition & 3 deletions dbinspector/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,13 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget

plugins {
id "com.android.library"
id "kotlin-android"
id "kotlin-parcelize"
id "com.google.protobuf"
id "org.jetbrains.kotlinx.kover"
}

android {
compileSdkVersion buildConfig.compileSdk
buildToolsVersion buildConfig.buildTools

defaultConfig {
minSdkVersion buildConfig.minSdk
Expand All @@ -25,7 +23,7 @@ android {
}
release {
minifyEnabled true
proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.txt"
proguardFiles getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.txt"
}
}

Expand Down
119 changes: 40 additions & 79 deletions dokka.gradle
Original file line number Diff line number Diff line change
@@ -1,87 +1,48 @@
apply plugin: "org.jetbrains.dokka"

tasks.named("dokkaJavadoc") {
outputDirectory.set(file("$buildDir/javadoc"))

dokkaSourceSets {
named("main") {
moduleName.set(rootProject.name)
includeNonPublic.set(false)
suppressObviousFunctions.set(true)
suppressInheritedMembers.set(true)
skipDeprecated.set(true)
reportUndocumented.set(true)
skipEmptyPackages.set(true)
platform.set(org.jetbrains.dokka.Platform.jvm)
jdkVersion.set(8)
noStdlibLink.set(false)
noJdkLink.set(false)
noAndroidSdkLink.set(false)
androidVariants.set(["debug"])
sourceLink {
localDirectory.set(file("src/main/kotlin"))
remoteUrl.set(uri("https://github.com/infinum/android_dbinspector/"))
remoteLineSuffix.set("#L")
}
perPackageOption {
prefix.set("com.infinum.dbinspector.extensions")
suppress.set(true)
}
perPackageOption {
prefix.set("com.infinum.dbinspector.domain.shared")
suppress.set(true)
}
perPackageOption {
prefix.set("com.infinum.dbinspector.ui.shared")
suppress.set(true)
}
perPackageOption {
prefix.set("com.infinum.dbinspector.sample")
suppress.set(true)
}
}
dokka {
dokkaPublications.html {
outputDirectory.set(project.layout.buildDirectory.dir("javadoc"))
Comment thread
KCeh marked this conversation as resolved.
}
}

tasks.named("dokkaHtml") {
outputDirectory.set(file("$buildDir/html"))
dokkaSourceSets.register("main") {
Comment thread
KCeh marked this conversation as resolved.
// Source directories
sourceRoots.from(file("src/main/kotlin"))
sourceRoots.from(file("src/main/java"))

sourceLink {
localDirectory.set(file("src/main/kotlin"))
remoteUrl.set(uri("https://github.com/infinum/android_dbinspector/"))
remoteLineSuffix.set("#L")
}

jdkVersion.set(8)

dokkaSourceSets {
named("main") {
moduleName.set(rootProject.name)
includeNonPublic.set(false)
suppressObviousFunctions.set(true)
suppressInheritedMembers.set(true)
skipDeprecated.set(true)
reportUndocumented.set(true)
skipEmptyPackages.set(true)
platform.set(org.jetbrains.dokka.Platform.jvm)
jdkVersion.set(8)
noStdlibLink.set(false)
noJdkLink.set(false)
noAndroidSdkLink.set(false)
androidVariants.set(["debug"])
sourceLink {
localDirectory.set(file("src/main/kotlin"))
remoteUrl.set(uri("https://github.com/infinum/android_dbinspector/"))
remoteLineSuffix.set("#L")
}
perPackageOption {
prefix.set("com.infinum.dbinspector.extensions")
suppress.set(true)
}
perPackageOption {
prefix.set("com.infinum.dbinspector.domain.shared")
suppress.set(true)
}
perPackageOption {
prefix.set("com.infinum.dbinspector.ui.shared")
suppress.set(true)
}
perPackageOption {
prefix.set("com.infinum.dbinspector.sample")
suppress.set(true)
}
suppressObviousFunctions.set(true)
suppressInheritedMembers.set(true)
skipDeprecated.set(true)
reportUndocumented.set(true)
skipEmptyPackages.set(true)
noStdlibLink.set(false)
noJdkLink.set(false)
noAndroidSdkLink.set(false)

perPackageOption {
matchingRegex.set("com\\.infinum\\.dbinspector\\.extensions.*")
suppress.set(true)
}
perPackageOption {
matchingRegex.set("com\\.infinum\\.dbinspector\\.domain\\.shared.*")
suppress.set(true)
}
perPackageOption {
matchingRegex.set("com\\.infinum\\.dbinspector\\.ui\\.shared.*")
suppress.set(true)
}
perPackageOption {
matchingRegex.set("com\\.infinum\\.dbinspector\\.sample.*")
suppress.set(true)
}
}
}
}
3 changes: 2 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
org.gradle.jvmargs=-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8

android.useAndroidX=true
android.enableJetifier=false
android.enableJetifier=false
android.newDsl=false
23 changes: 13 additions & 10 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,29 +1,30 @@
[versions]
dbinspector = "6.0.0"
gradle = "8.13.2"
gradle = "9.1.1"
kotlin = "2.2.21"
coroutines = "1.10.2"
core = "1.17.0"
core = "1.18.0"
appcompat = "1.7.1"
activity = "1.12.3"
activity = "1.13.0"
fragment = "1.8.9"
lifecycle = "2.10.0"
viewpager = "1.1.0"
paging = "3.4.0"
paging = "3.4.2"
recyclerview = "1.4.0"
startup = "1.2.0"
swiperefresh = "1.2.0"
datastore = "1.2.0"
datastore = "1.2.1"
dynamicanimation = "1.1.0"
design = "1.13.0"
protobuf-core = "4.33.5"
protobuf-plugin = "0.9.6"
koin = "4.1.1"
koin = "4.2.1"
detekt = "1.23.8"
dokka = "2.1.0"
kover = "0.9.7"
dokka = "2.2.0"
kover = "0.9.8"
jacoco = "0.8.8"
junit5 = "5.11.2"
junit-platform = "1.11.2"
mockk = "1.14.9"
mockito = "5.21.0"
mockitokotlin = "6.2.3"
Expand All @@ -38,6 +39,9 @@ tools-gradle = { module = "com.android.tools.build:gradle", version.ref = "gradl
kotlin-gradle = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
kotlin-core = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8", version.ref = "kotlin" }

junit5 = { module = "org.junit.jupiter:junit-jupiter", version.ref = "junit5" }
junit-launcher = { module = "org.junit.platform:junit-platform-launcher", version.ref = "junit-platform" }

coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "coroutines" }
coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "coroutines" }

Expand Down Expand Up @@ -73,8 +77,6 @@ dokka = { module = "org.jetbrains.dokka:dokka-gradle-plugin", version.ref = "dok

kover = { module = "org.jetbrains.kotlinx:kover-gradle-plugin", version.ref = "kover" }

junit5 = { module = "org.junit.jupiter:junit-jupiter", version.ref = "junit5" }

mockk = { module = "io.mockk:mockk", version.ref = "mockk" }

mockito-core = { module = "org.mockito:mockito-core", version.ref = "mockito" }
Expand Down Expand Up @@ -102,6 +104,7 @@ androidx = [

test = [
"junit5",
"junit-launcher",
"koin-test",
"koin-junit5",
"mockk",
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
4 changes: 3 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading
Loading