Skip to content

Commit

Permalink
Bare minimum changes to allow JitPack build of final apiclient versio…
Browse files Browse the repository at this point in the history
…n without JCenter dependencies.

- Disabled Detekt
- Disabled Publishing plugin
- Removed JCenter repository
- Added MavenCentral repository
- Increased memory for Gradle builds (prevents out of memory)
- Updated Volley to 1.2.0 (1.1.x not available on MavenCentral)
  • Loading branch information
nielsvanvelzen committed Jun 12, 2021
1 parent a465bb1 commit 221b7db
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 14 deletions.
22 changes: 11 additions & 11 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
id("maven-publish")
id("io.gitlab.arturbosch.detekt").version("1.9.1")
// id("io.gitlab.arturbosch.detekt").version("1.9.1")
}

// Versioning
Expand All @@ -11,31 +11,31 @@ allprojects {

buildscript {
repositories {
mavenCentral()
google()
jcenter()
}

dependencies {
classpath("com.android.tools.build:gradle:4.1.1")
classpath("com.android.tools.build:gradle:4.0.2")
classpath(kotlin("gradle-plugin", "1.3.72"))
}
}

allprojects {
repositories {
mavenCentral()
google()
jcenter()
}

// Publishing
plugins.apply("maven-publish")
publishing.repositories.jellyfinBintray(this)
// publishing.repositories.jellyfinBintray(this)

// Detekt
plugins.apply("io.gitlab.arturbosch.detekt")
detekt {
buildUponDefaultConfig = true
ignoreFailures = true
config = files("$rootDir/detekt.yml")
}
// plugins.apply("io.gitlab.arturbosch.detekt")
// detekt {
// buildUponDefaultConfig = true
// ignoreFailures = true
// config = files("$rootDir/detekt.yml")
// }
}
2 changes: 1 addition & 1 deletion buildSrc/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ plugins {
}

repositories {
jcenter()
mavenCentral()
}
2 changes: 1 addition & 1 deletion buildSrc/src/main/kotlin/Dependencies.kt
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ object Dependencies {
}

// Non-categorised dependencies
const val volley = "com.android.volley:volley:1.1.1"
const val volley = "com.android.volley:volley:1.2.0"
const val gson = "com.google.code.gson:gson:2.8.6"
const val javaWebSocket = "org.java-websocket:Java-WebSocket:1.4.1"
const val junit = "junit:junit:4.12"
Expand Down
1 change: 1 addition & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
android.useAndroidX=true
kotlin.incremental=true
org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m

# When publishing the "secure" checksums Bintray is unable to correctly identify the versions
# and will use the artifact names (modules) as version names
Expand Down
2 changes: 1 addition & 1 deletion samples/kotlin-console/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ application {
}

repositories {
jcenter()
mavenCentral()

// Repository needed for kotlinx-cli
maven("https://kotlin.bintray.com/kotlinx")
Expand Down

0 comments on commit 221b7db

Please sign in to comment.