Skip to content

Commit

Permalink
Fix the build process
Browse files Browse the repository at this point in the history
  • Loading branch information
gentlecat committed Dec 28, 2024
1 parent ed6da1a commit c9bc803
Show file tree
Hide file tree
Showing 8 changed files with 232 additions and 153 deletions.
15 changes: 14 additions & 1 deletion app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@ android {

compileOptions.incremental = false

buildFeatures.buildConfig = true

defaultConfig {
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.compileSdkVersion
Expand All @@ -61,13 +63,24 @@ android {

buildTypes {
release {
minifyEnabled true
debuggable false
jniDebuggable false
renderscriptDebuggable false
pseudoLocalesEnabled false
zipAlignEnabled true

shrinkResources true
minifyEnabled true
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'

// proguardFiles
// getDefaultProguardFile('proguard-android-optimize.txt')
//
// // List additional ProGuard rules for the given build type here. By default,
// // Android Studio creates and includes an empty rules file for you (located
// // at the root directory of each module).
// 'proguard-rules.pro'
// testProguardFiles
}
}

Expand Down
1 change: 1 addition & 0 deletions app/proguard-rules.pro
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
-dontwarn org.joda.**
12 changes: 9 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ subprojects {
}

dependencies {
classpath 'com.android.tools.build:gradle:4.1.3'
classpath 'com.android.tools.build:gradle:8.7.3'
}

}
Expand All @@ -33,6 +33,12 @@ ext {
appVersion = 30
}

task clean(type: Delete) {
delete getLayout().getBuildDirectory()
tasks.withType(JavaCompile).configureEach {
options.compilerArgs += [
'org.gradle.jvmargs=-Xmx8g',
]
}

tasks.register('clean', Delete) {
delete getLayout().getBuildDirectory()
}
1 change: 0 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
android.defaults.buildfeatures.buildconfig=true
android.enableJetifier=true
android.nonFinalResIds=false
android.nonTransitiveRClass=true
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.9-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-all.zip
Loading

0 comments on commit c9bc803

Please sign in to comment.