Skip to content

Commit 13b070c

Browse files
authored
Update build.gradle
New
1 parent 9d01e7d commit 13b070c

1 file changed

Lines changed: 33 additions & 58 deletions

File tree

app/build.gradle

Lines changed: 33 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ android {
99

1010
defaultConfig {
1111
applicationId "com.symja.app"
12-
minSdk 31
12+
minSdk 24 // थोड़ा कम रखो ताकि ज़्यादा devices पर चले
13+
targetSdk 36
1314
versionCode 1
1415
versionName "3.0.0"
1516

@@ -21,16 +22,10 @@ android {
2122
minifyEnabled false
2223
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
2324
}
24-
debug {
25-
26-
}
2725
}
2826

2927
compileOptions {
30-
// https://developer.android.com/studio/write/java8-support
31-
// For AGP 4.1+
3228
coreLibraryDesugaringEnabled = true
33-
3429
sourceCompatibility JavaVersion.VERSION_1_8
3530
targetCompatibility JavaVersion.VERSION_1_8
3631
}
@@ -41,71 +36,51 @@ android {
4136

4237
packagingOptions {
4338
resources {
44-
excludes += ['META-INF/DEPENDENCIES']
45-
pickFirsts += ['**/*.xsd',
46-
'META-INF/*.md',
47-
'META-INF/versions/9/OSGI-INF/MANIFEST.MF',
48-
'**/LICENSE.txt',
49-
'**/Messages.properties',
50-
'**/Log4j2Plugins.dat']
39+
excludes += [
40+
'META-INF/DEPENDENCIES',
41+
'**/LICENSE.txt',
42+
'**/Messages.properties',
43+
'**/Log4j2Plugins.dat'
44+
]
45+
pickFirsts += [
46+
'META-INF/*.md',
47+
'**/*.xsd',
48+
'META-INF/versions/9/OSGI-INF/MANIFEST.MF'
49+
]
5150
}
5251
}
53-
54-
testOptions {
55-
animationsDisabled = true
56-
}
57-
58-
buildFeatures {
59-
buildConfig = true
60-
}
6152
}
6253

63-
64-
// https://github.com/Celeral/log4j2-android
65-
configurations.configureEach { config ->
66-
{
67-
if (config.name.startsWith("test") || config.name.contains("Test") && !config.name.contains("Android")) {
68-
exclude group: "com.celeral", module: "log4j2-android"
69-
} else {
70-
exclude group: "org.apache.logging.log4j", module: "log4j-core"
71-
}
72-
}
54+
configurations.configureEach {
55+
exclude group: "org.apache.logging.log4j", module: "log4j-core"
56+
exclude group: "com.google.guava", module: "guava-jdk5"
7357
resolutionStrategy {
7458
force "org.apache.logging.log4j:log4j-api:2.17.2"
7559
}
7660
}
7761

78-
7962
dependencies {
80-
configurations.configureEach {
81-
resolutionStrategy.capabilitiesResolution.withCapability("com.google.collections:google-collections") {
82-
select("com.google.guava:guava:0")
83-
}
84-
// and/or
85-
resolutionStrategy.capabilitiesResolution.withCapability("com.google.guava:listenablefuture") {
86-
select("com.google.guava:guava:0")
87-
}
88-
}
89-
90-
coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.1.5")
91-
92-
testImplementation 'junit:junit:4.13.2'
93-
94-
androidTestImplementation 'org.junit.jupiter:junit-jupiter-api:5.13.3'
95-
androidTestImplementation 'androidx.test.ext:junit:1.2.1'
96-
androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
97-
androidTestImplementation 'androidx.test.espresso:espresso-contrib:3.6.1'
98-
androidTestImplementation 'androidx.test:runner:1.6.2'
99-
androidTestImplementation 'androidx.test:rules:1.6.1'
100-
101-
implementation 'com.google.android.material:material:1.12.0'
63+
// Core Android + UI
10264
implementation 'androidx.appcompat:appcompat:1.7.1'
65+
implementation 'com.google.android.material:material:1.12.0'
10366
implementation 'androidx.constraintlayout:constraintlayout:2.2.1'
10467
implementation "androidx.browser:browser:1.8.0"
10568

106-
implementation project(':modules:programming')
69+
// Symja math engine
70+
implementation 'org.matheclipse:matheclipse-core:3.0.0'
71+
implementation 'org.matheclipse:matheclipse-api:3.0.0'
10772

108-
// https://github.com/Celeral/log4j2-android
73+
// Logger for Android (instead of log4j-core)
10974
runtimeOnly "com.celeral:log4j2-android:1.0.0"
11075

111-
}
76+
// Guava for collections support
77+
implementation 'com.google.guava:guava:33.0.0-android'
78+
79+
// Desugar JDK libs for Java 8+ APIs
80+
coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:2.1.5"
81+
82+
// Tests
83+
testImplementation 'junit:junit:4.13.2'
84+
androidTestImplementation 'androidx.test.ext:junit:1.2.1'
85+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
86+
}

0 commit comments

Comments
 (0)