Skip to content

Commit c70eb11

Browse files
abubkr-hagoabubkr-hago
committed
refactor: Bump AGP from 7.1.3 to 8.5.2
1 parent 8cf87b3 commit c70eb11

File tree

12 files changed

+87
-51
lines changed

12 files changed

+87
-51
lines changed

‎bolts-tasks/build.gradle‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,13 @@ java {
1818

1919
javadoc.options.addStringOption('Xdoclint:none', '-quiet')
2020

21-
task sourcesJar(type: Jar) {
21+
tasks.register('sourcesJar', Jar) {
2222
archiveClassifier.set('sources')
2323
from sourceSets.main.allJava
2424
}
2525

26-
task javadocJar(type: Jar, dependsOn: javadoc) {
26+
tasks.register('javadocJar', Jar) {
27+
dependsOn javadoc
2728
archiveClassifier.set('javadoc')
2829
from javadoc.destinationDir
2930
}
@@ -39,7 +40,7 @@ afterEvaluate {
3940
publishing {
4041
publications {
4142
boltsPublication(MavenPublication) {
42-
from components.java
43+
from components.findByName('java')
4344
}
4445
}
4546
}
@@ -55,8 +56,8 @@ jacocoTestReport {
5556
group = "Reporting"
5657
description = "Generate Jacoco coverage reports after running tests."
5758
reports {
58-
xml.enabled true
59-
html.enabled true
59+
xml { enabled true }
60+
html { enabled true }
6061
}
6162
}
6263

‎build.gradle‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,8 @@ buildscript {
77
mavenCentral()
88
}
99
dependencies {
10-
classpath 'com.android.tools.build:gradle:7.1.3'
10+
classpath 'com.android.tools.build:gradle:8.5.2'
1111
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
12-
classpath "org.jacoco:org.jacoco.core:$jacocoVersion"
13-
classpath "com.dicedmelon.gradle:jacoco-android:0.1.5"
1412
classpath "io.freefair.gradle:android-gradle-plugins:4.2.0-m1"
1513
classpath "com.diffplug.spotless:spotless-plugin-gradle:$spotlessVersion"
1614
}

‎coroutines/build.gradle‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ apply plugin: "io.freefair.android-javadoc-jar"
55
apply plugin: "io.freefair.android-sources-jar"
66

77
android {
8-
compileSdkVersion rootProject.ext.compileSdkVersion
8+
namespace 'com.parse.coroutines'
9+
compileSdk rootProject.ext.compileSdkVersion
910

1011
defaultConfig {
1112
minSdkVersion rootProject.ext.minSdkVersion
@@ -37,6 +38,10 @@ android {
3738
kotlinOptions {
3839
jvmTarget = "1.8"
3940
}
41+
42+
buildFeatures {
43+
buildConfig true
44+
}
4045
}
4146

4247
ext {
@@ -54,7 +59,7 @@ afterEvaluate {
5459
publishing {
5560
publications {
5661
release(MavenPublication) {
57-
from components.release
62+
from components.findByName('release')
5863
}
5964
}
6065
}

‎facebook/build.gradle‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ apply plugin: "io.freefair.android-javadoc-jar"
44
apply plugin: "io.freefair.android-sources-jar"
55

66
android {
7-
compileSdkVersion rootProject.ext.compileSdkVersion
7+
namespace 'com.parse.facebook'
8+
compileSdk rootProject.ext.compileSdkVersion
89

910
defaultConfig {
1011
minSdkVersion rootProject.ext.minSdkVersion
@@ -32,6 +33,10 @@ android {
3233
sourceCompatibility JavaVersion.VERSION_1_8
3334
targetCompatibility JavaVersion.VERSION_1_8
3435
}
36+
37+
buildFeatures {
38+
buildConfig true
39+
}
3540
}
3641

3742
dependencies {
@@ -48,7 +53,7 @@ afterEvaluate {
4853
publishing {
4954
publications {
5055
release(MavenPublication) {
51-
from components.release
56+
from components.findByName('release')
5257
}
5358
}
5459
}

‎fcm/build.gradle‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ apply plugin: "io.freefair.android-javadoc-jar"
44
apply plugin: "io.freefair.android-sources-jar"
55

66
android {
7-
compileSdkVersion rootProject.ext.compileSdkVersion
7+
namespace 'com.parse.fcm'
8+
compileSdk rootProject.ext.compileSdkVersion
89

910
defaultConfig {
1011
minSdkVersion rootProject.ext.minSdkVersion
@@ -33,6 +34,9 @@ android {
3334
targetCompatibility JavaVersion.VERSION_1_8
3435
}
3536

37+
buildFeatures {
38+
buildConfig true
39+
}
3640
}
3741

3842
dependencies {
@@ -44,7 +48,7 @@ afterEvaluate {
4448
publishing {
4549
publications {
4650
release(MavenPublication) {
47-
from components.release
51+
from components.findByName('release')
4852
}
4953
}
5054
}

‎google/build.gradle‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ apply plugin: "io.freefair.android-javadoc-jar"
55
apply plugin: "io.freefair.android-sources-jar"
66

77
android {
8-
compileSdkVersion rootProject.ext.compileSdkVersion
8+
namespace 'com.parse.google'
9+
compileSdk rootProject.ext.compileSdkVersion
910

1011
defaultConfig {
1112
minSdkVersion rootProject.ext.minSdkVersion
@@ -37,6 +38,10 @@ android {
3738
kotlinOptions {
3839
jvmTarget = "1.8"
3940
}
41+
42+
buildFeatures {
43+
buildConfig true
44+
}
4045
}
4146

4247
dependencies {
@@ -51,7 +56,7 @@ afterEvaluate {
5156
publishing {
5257
publications {
5358
release(MavenPublication) {
54-
from components.release
59+
from components.findByName('release')
5560
}
5661
}
5762
}

‎gradle.properties‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
version = 4.3.0
22
android.enableJetifier = true
33
android.useAndroidX = true
4+
org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Sat Apr 16 09:27:50 CEST 2022
1+
#Thu Aug 15 20:11:31 GST 2024
22
distributionBase=GRADLE_USER_HOME
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
43
distributionPath=wrapper/dists
5-
zipStorePath=wrapper/dists
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
65
zipStoreBase=GRADLE_USER_HOME
6+
zipStorePath=wrapper/dists

‎ktx/build.gradle‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ apply plugin: "io.freefair.android-javadoc-jar"
55
apply plugin: "io.freefair.android-sources-jar"
66

77
android {
8-
compileSdkVersion rootProject.ext.compileSdkVersion
8+
namespace 'com.parse.ktx'
9+
compileSdk rootProject.ext.compileSdkVersion
910

1011
defaultConfig {
1112
minSdkVersion rootProject.ext.minSdkVersion
@@ -38,6 +39,10 @@ android {
3839
kotlinOptions {
3940
jvmTarget = "1.8"
4041
}
42+
43+
buildFeatures {
44+
buildConfig true
45+
}
4146
}
4247

4348
dependencies {
@@ -49,7 +54,7 @@ afterEvaluate {
4954
publishing {
5055
publications {
5156
release(MavenPublication) {
52-
from components.release
57+
from components.findByName('release')
5358
}
5459
}
5560
}

‎parse/build.gradle‎

Lines changed: 28 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ apply plugin: "io.freefair.android-javadoc-jar"
44
apply plugin: "io.freefair.android-sources-jar"
55

66
android {
7-
compileSdkVersion rootProject.ext.compileSdkVersion
7+
namespace 'com.parse'
8+
compileSdk rootProject.ext.compileSdkVersion
89

910
defaultConfig {
1011
minSdkVersion rootProject.ext.minSdkVersion
@@ -15,6 +16,18 @@ android {
1516
testOptions {
1617
unitTests {
1718
includeAndroidResources = true
19+
20+
all {
21+
// Configure JaCoCo options
22+
jacoco {
23+
includeNoLocationClasses = true
24+
excludes.add("jdk.internal.*")
25+
}
26+
// Configure test logging
27+
testLogging {
28+
events("failed")
29+
}
30+
}
1831
}
1932
}
2033

@@ -25,20 +38,24 @@ android {
2538
buildTypes {
2639
debug {
2740
testCoverageEnabled = true
28-
buildConfigField("String","PARSE_VERSION","\"${version}\"")
41+
buildConfigField("String", "PARSE_VERSION", "\"${version}\"")
2942
}
3043
release {
3144
minifyEnabled false
3245
testCoverageEnabled = false
3346
proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
34-
buildConfigField("String","PARSE_VERSION","\"${version}\"")
47+
buildConfigField("String", "PARSE_VERSION", "\"${version}\"")
3548
}
3649
}
3750

3851
compileOptions {
3952
sourceCompatibility JavaVersion.VERSION_1_8
4053
targetCompatibility JavaVersion.VERSION_1_8
4154
}
55+
56+
buildFeatures {
57+
buildConfig true
58+
}
4259
}
4360

4461
ext {
@@ -65,38 +82,23 @@ afterEvaluate {
6582
publishing {
6683
publications {
6784
release(MavenPublication) {
68-
from components.release
85+
from components.findByName('release')
6986
}
7087
}
7188
}
7289
}
7390

7491
//endregion
7592

76-
//region Code Coverage
77-
78-
apply plugin: "com.dicedmelon.gradle.jacoco-android"
79-
80-
jacoco {
81-
toolVersion = rootProject.ext.jacocoVersion
82-
}
83-
84-
tasks.withType(Test) {
85-
jacoco.includeNoLocationClasses = true
86-
jacoco.excludes = ['jdk.internal.*']
87-
testLogging {
88-
events "failed"
93+
tasks.withType(JacocoReport).configureEach {
94+
jacoco.toolVersion = rootProject.ext.jacocoVersion
95+
reports {
96+
csv.required.set(false)
97+
html.required.set(true)
98+
xml.required.set(true)
8999
}
90100
}
91101

92-
tasks.withType(Test) {
102+
tasks.withType(Test).configureEach {
93103
useJUnitPlatform()
94104
}
95-
96-
jacocoAndroidUnitTestReport {
97-
csv.enabled false
98-
html.enabled true
99-
xml.enabled true
100-
}
101-
102-
//endregion

0 commit comments

Comments
 (0)