Skip to content

Commit

Permalink
Add format task for build gradle files
Browse files Browse the repository at this point in the history
Now the commad to run each time should be
`./gradlew format && ./gradlew build`
  • Loading branch information
JingMatrix committed Jan 6, 2023
1 parent 9067a69 commit d81cc2a
Show file tree
Hide file tree
Showing 3 changed files with 52 additions and 59 deletions.
70 changes: 29 additions & 41 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,51 +1,39 @@
plugins {
id("com.android.application")
id("org.jetbrains.kotlin.android")
id("com.ncorti.ktfmt.gradle") version "0.11.0"
id("com.android.application")
id("org.jetbrains.kotlin.android")
id("com.ncorti.ktfmt.gradle")
}

android {
compileSdk = 33
namespace = "org.matrix.chromext"

defaultConfig {
applicationId = "org.matrix.chromext"
minSdk = 26
targetSdk = 33
versionCode = 2
versionName = "2.0.0"
}
compileSdk = 33
namespace = "org.matrix.chromext"

buildFeatures {
buildConfig = true
}
// packagingOptions {
// // Remove terminal-emulator and termux-shared JNI libs added via termux-shared dependency
// exclude("lib/*/libtermux.so")
// exclude("lib/*/liblocal-socket.so")
// }

buildTypes {
release {
isShrinkResources = true
isMinifyEnabled = true
proguardFiles("proguard-rules.pro")
}
}
defaultConfig {
applicationId = "org.matrix.chromext"
minSdk = 26
targetSdk = 33
versionCode = 2
versionName = "2.0.0"
}

androidResources {
additionalParameters("--allow-reserved-package-id", "--package-id", "0x45")
}
buildFeatures { buildConfig = true }

compileOptions {
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
}
kotlinOptions {
jvmTarget = JavaVersion.VERSION_11.toString()
buildTypes {
release {
isShrinkResources = true
isMinifyEnabled = true
proguardFiles("proguard-rules.pro")
}
}
}

androidResources { additionalParameters("--allow-reserved-package-id", "--package-id", "0x45") }

dependencies {
compileOnly("de.robv.android.xposed:api:82")
compileOptions {
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
}

kotlinOptions { jvmTarget = JavaVersion.VERSION_11.toString() }
}

dependencies { compileOnly("de.robv.android.xposed:api:82") }
15 changes: 10 additions & 5 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,9 +1,14 @@
import com.ncorti.ktfmt.gradle.tasks.KtfmtFormatTask

plugins {
id("com.android.application") version "8.0.0-alpha09" apply false
id("com.android.library") version "8.0.0-alpha09" apply false
id("org.jetbrains.kotlin.android") version "1.8.0" apply false
id("com.android.application") version "8.0.0-alpha09" apply false
id("com.android.library") version "8.0.0-alpha09" apply false
id("org.jetbrains.kotlin.android") version "1.8.0" apply false
id("com.ncorti.ktfmt.gradle") version "0.11.0"
}

tasks.register<Delete>("clean").configure {
delete(rootProject.buildDir)
tasks.register<KtfmtFormatTask>("format") {
source = project.fileTree(rootDir)
include("*.gradle.kts", "app/*.gradle.kts")
dependsOn(":app:ktfmtFormat")
}
26 changes: 13 additions & 13 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
pluginManagement {
repositories {
gradlePluginPortal()
google()
mavenCentral()
}
repositories {
gradlePluginPortal()
google()
mavenCentral()
}
}

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

include(":app")
rootProject.name = "ChromeXt"

rootProject.name = "ChromeXt"

0 comments on commit d81cc2a

Please sign in to comment.