Skip to content

Commit

Permalink
bump versions
Browse files Browse the repository at this point in the history
  • Loading branch information
5ec1cff committed Nov 7, 2024
1 parent 4e792ba commit 5567b15
Show file tree
Hide file tree
Showing 7 changed files with 51 additions and 40 deletions.
11 changes: 5 additions & 6 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import java.io.FileWriter
import java.util.Properties

plugins {
id("com.android.application")
id("org.jetbrains.kotlin.android")
alias(libs.plugins.agp.app)
alias(libs.plugins.kotlin)
}

val keystorePropertiesFile = rootProject.file("keystore.properties")
Expand All @@ -20,7 +20,7 @@ val keystoreProperties = if (keystorePropertiesFile.exists() && keystoreProperti

android {
namespace = "io.github.a13e300.tools"
compileSdk = 34
compileSdk = 35
signingConfigs {
if (keystoreProperties != null) {
create("release") {
Expand All @@ -37,7 +37,7 @@ android {
defaultConfig {
applicationId = "io.github.a13e300.tools.stethox"
minSdk = 24
targetSdk = 34
targetSdk = 35
versionCode = 2
versionName = "1.0.2"
externalNativeBuild {
Expand Down Expand Up @@ -226,8 +226,7 @@ task("generateDefaultOkHttp3Helper") {
}

dependencies {
implementation("androidx.annotation:annotation:1.7.0")
implementation("androidx.core:core-ktx:+")
implementation("androidx.annotation:annotation:1.9.1")
compileOnly("de.robv.android.xposed:api:82")
compileOnly(project(":hidden-api"))
implementation("com.github.5ec1cff.stetho:stetho:1.0-alpha-1")
Expand Down
25 changes: 4 additions & 21 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,24 +1,7 @@
buildscript {

val kotlin_version by extra("1.9.10")
repositories {
google()
mavenCentral()
}
dependencies {
classpath("com.android.tools.build:gradle:8.2.0")
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version")
}
}

allprojects {
repositories {
mavenLocal()
google()
mavenCentral()
maven("https://api.xposed.info/")
maven("https://jitpack.io")
}
plugins {
alias(libs.plugins.agp.app) apply false
alias(libs.plugins.agp.lib) apply false
alias(libs.plugins.kotlin) apply false
}

task("clean", type = Delete::class) {
Expand Down
6 changes: 3 additions & 3 deletions debugstub/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
plugins {
id("com.android.application")
alias(libs.plugins.agp.app)
}

android {
namespace = "io.github.a13e300.demo"
compileSdk = 34
compileSdk = 35

defaultConfig {
// rename to the debug target
// or android studio will not recognize
applicationId = "io.github.a13e300.demo"
minSdk = 27
targetSdk = 34
targetSdk = 35
versionCode = 1
versionName = "1.0"
}
Expand Down
8 changes: 8 additions & 0 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
[versions]
agp = "8.7.2"
kotlin = "2.0.20"

[plugins]
agp-app = { id = "com.android.application", version.ref = "agp" }
agp-lib = { id = "com.android.library", version.ref = "agp" }
kotlin = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Thu Mar 09 17:29:28 CST 2023
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
12 changes: 3 additions & 9 deletions hidden-api/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
plugins {
id("com.android.library")
alias(libs.plugins.agp.lib)
}

android {
namespace = "io.github.a13e300.hidden_api"
compileSdk = 33
compileSdk = 35

defaultConfig {
minSdk = 16
minSdk = 24

testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles("consumer-rules.pro")
}

Expand All @@ -30,9 +29,4 @@ android {

dependencies {

implementation("androidx.appcompat:appcompat:1.6.1")
implementation("com.google.android.material:material:1.9.0")
testImplementation("junit:junit:4.13.2")
androidTestImplementation("androidx.test.ext:junit:1.1.5")
androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
}
27 changes: 27 additions & 0 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,3 +1,30 @@
pluginManagement {
repositories {
google {
content {
includeGroupByRegex("com\\.android.*")
includeGroupByRegex("com\\.google.*")
includeGroupByRegex("androidx.*")
}
}
mavenCentral()
gradlePluginPortal()
}
}

dependencyResolutionManagement {
repositoriesMode = RepositoriesMode.FAIL_ON_PROJECT_REPOS
repositories {
mavenLocal()
google()
mavenCentral()
maven("https://jitpack.io")
maven("https://api.xposed.info/")
}
}

rootProject.name = "StethoX"

include(":app")
include(":hidden-api")
include(":debugstub")

0 comments on commit 5567b15

Please sign in to comment.