Skip to content

Commit

Permalink
Remove dependency on jcenter (#44)
Browse files Browse the repository at this point in the history
* Dependency versions bump:
- kotlin to 1.4.30
- AGP to 7.0.0-alpha06
- AndroidX annotations to 1.2.0-beta01
Remove jcenter dependency
  • Loading branch information
koral-- authored Feb 14, 2021
1 parent fb5596a commit 14a1e93
Show file tree
Hide file tree
Showing 22 changed files with 378 additions and 304 deletions.
12 changes: 6 additions & 6 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ GEM
addressable (2.7.0)
public_suffix (>= 2.0.2, < 5.0)
ansi (1.5.0)
ast (2.4.1)
ast (2.4.2)
claide (1.0.3)
claide-plugins (0.9.2)
cork
Expand All @@ -13,7 +13,7 @@ GEM
colored2 (3.1.2)
cork (0.3.0)
colored2 (~> 3.1)
danger (8.2.1)
danger (8.2.2)
claide (~> 1.0)
claide-plugins (>= 0.9.2)
colored2 (~> 3.1)
Expand All @@ -39,8 +39,8 @@ GEM
ruby2_keywords
faraday-http-cache (2.2.0)
faraday (>= 0.8)
faraday-net_http (1.0.0)
git (1.7.0)
faraday-net_http (1.0.1)
git (1.8.1)
rchardet (~> 1.8)
kramdown (2.3.0)
rexml
Expand All @@ -62,7 +62,7 @@ GEM
ruby-ll (2.1.2)
ansi
ast
ruby2_keywords (0.0.2)
ruby2_keywords (0.0.4)
sawyer (0.8.2)
addressable (>= 2.3.5)
faraday (> 0.8, < 2.0)
Expand All @@ -78,4 +78,4 @@ DEPENDENCIES
danger-kotlin_detekt

BUNDLED WITH
2.1.4
2.2.9
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@ repositories {
- [Android Debug Database](https://github.com/amitshekhariitbhu/Android-Debug-Database)
- Hyperion menu item with Device market name [Hyperion Device Info](#device-info-plugin)
- Hyperion menu item with font scale changer [Hyperion Font Scale](#font-scale-plugin)
- Hyperion menu item with Chuck launcher [Hyperion FoQA Chuck](#chuck-plugin)
- Hyperion menu item with Chucker launcher [Hyperion FoQA Chucker](#chucker-plugin)

See [build.gradle](foqa/build.gradle) for a complete list of components. And [build.gradle](build.gradle) for versions.
See [build.gradle](foqa/build.gradle) for a complete list of components. And [build.gradle](build.gradle.kts) for versions.

## FoQA Hyperion plugins

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

This file was deleted.

94 changes: 94 additions & 0 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,94 @@
import com.android.build.gradle.LibraryExtension
import io.gitlab.arturbosch.detekt.Detekt
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile

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

dependencies {
classpath(Dependencies.androidGradlePlugin)
classpath(Dependencies.kotlinGradlePlugin)
}
}

plugins {
id("io.gitlab.arturbosch.detekt") version "1.16.0-RC1"
id("org.shipkit.java") version "2.3.5"
id("com.github.ben-manes.versions") version "0.36.0"
}

repositories {
mavenCentral()
maven("https://dl.bintray.com/kotlin/kotlinx/")
}

dependencies {
detekt(Dependencies.detektFormatting)
detekt(Dependencies.detektCli)
}

detekt {
input = files(projectDir)
config = rootProject.files("detekt-config.yml")
}

tasks.withType(Detekt::class) {
exclude("build/")
exclude("buildSrc/build/")
parallel = true
reports {
xml.enabled = true
html.enabled = false
txt.enabled = false
}
}

tasks.withType(KotlinCompile::class).all {
kotlinOptions {
freeCompilerArgs = listOf("-Xexplicit-api=strict")
}
}

subprojects {
repositories {
google()
mavenCentral()
maven("https://jitpack.io")
}

group = "pl.droidsonroids.foqa"

if (name == "sample") {
return@subprojects
}

apply(plugin = "com.android.library")
apply(plugin = "kotlin-android")
apply(plugin = "kotlin-kapt")
apply(plugin = "org.shipkit.bintray")
apply(plugin = "org.shipkit.android-publish")

with(extensions.getByName("android") as LibraryExtension) {
compileSdkVersion(Dependencies.compileSdk)
defaultConfig {
setMinSdkVersion(Dependencies.minSdk)
setTargetSdkVersion(Dependencies.targetSdk)
}

resourcePrefix = "foqa_"

variantFilter {
ignore = name == "debug"
}
}

dependencies {
"implementation"(kotlin("stdlib-jdk7"))
"implementation"(Dependencies.hyperionPlugin)
"kapt"(Dependencies.autoService)
}
}
1 change: 1 addition & 0 deletions buildSrc/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/build
8 changes: 8 additions & 0 deletions buildSrc/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
plugins {
`kotlin-dsl`
}

repositories {
mavenCentral()
google()
}
29 changes: 29 additions & 0 deletions buildSrc/src/main/kotlin/Dependencies.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
object Dependencies {
const val compileSdk = 30
const val targetSdk = 30
const val minSdk = 19

const val autoService = "com.google.auto.service:auto-service:1.0-rc7"
const val androidxAnnotations = "androidx.annotation:annotation:1.2.0-beta01"
const val detektFormatting = "io.gitlab.arturbosch.detekt:detekt-formatting:1.16.0-RC1"
const val detektCli = "io.gitlab.arturbosch.detekt:detekt-cli:1.16.0-RC1"
const val hyperionCore = "com.willowtreeapps.hyperion:hyperion-core:0.9.31"
const val hyperionPlugin = "com.willowtreeapps.hyperion:hyperion-plugin:0.9.31"
const val hyperionAttr = "com.willowtreeapps.hyperion:hyperion-attr:0.9.31"
const val hyperionMeasurement = "com.willowtreeapps.hyperion:hyperion-measurement:0.9.31"
const val hyperionDisk = "com.willowtreeapps.hyperion:hyperion-disk:0.9.31"
const val hyperionRecorder = "com.willowtreeapps.hyperion:hyperion-recorder:0.9.31"
const val hyperionPhoenix = "com.willowtreeapps.hyperion:hyperion-phoenix:0.9.31"
const val hyperionCrash = "com.willowtreeapps.hyperion:hyperion-crash:0.9.31"
const val hyperionSharedPreferences = "com.willowtreeapps.hyperion:hyperion-shared-preferences:0.9.31"
const val hyperionGeigerCounter = "com.willowtreeapps.hyperion:hyperion-geiger-counter:0.9.31"
const val hyperionTimber = "com.willowtreeapps.hyperion:hyperion-timber:0.9.31"
const val hyperionBuildConfig = "com.willowtreeapps.hyperion:hyperion-build-config:0.9.31"
const val hyperionAppInfo = "com.github.STAR-ZERO:Hyperion-AppInfo:1.1.0"
const val chucker = "com.github.ChuckerTeam.Chucker:library:3.4.0"
const val deviceNames = "com.jaredrummler:android-device-names:2.0.0"
const val debugDb = "com.github.amitshekhariitbhu.Android-Debug-Database:debug-db:1.0.6"
const val multidex = "androidx.multidex:multidex:2.0.1"
const val androidGradlePlugin = "com.android.tools.build:gradle:7.0.0-alpha06"
const val kotlinGradlePlugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.30"
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
androidPublish.artifactId = 'chucker'
androidPublish.artifactId = "chucker"
description = "Hyperion plugin for menu item with Chuckuer - simple in-app HTTP inspector. Part of FoQA project."

dependencies {
implementation "com.github.ChuckerTeam.Chucker:library:$versions.chucker"
}
api(Dependencies.chucker)
}
Loading

0 comments on commit 14a1e93

Please sign in to comment.