Bump gradle version, migrate from maven to maven_publish

vshali · vshali · commit d431a6c0d8ad · 2023-02-08T18:13:17.000+05:30
diff --git a/build.gradle b/build.gradle
@@ -12,7 +12,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.0'
+        classpath 'com.android.tools.build:gradle:7.2.0'
         classpath "org.jfrog.buildinfo:build-info-extractor-gradle:4.28.3"
     }
 }
diff --git a/gradle.properties b/gradle.properties
@@ -1,2 +1,3 @@
 VERSION_NAME=1.0.0
 GROUP=com.facebook.battery
+android.useAndroidX=true
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip
diff --git a/metrics/build.gradle b/metrics/build.gradle
@@ -45,8 +45,6 @@ dependencies {
     testImplementation 'org.powermock:powermock-module-junit4:2.0.2'
 }
 
-apply from: rootProject.file('release.gradle')
-
 ext.versionName = { ->
     def currentTag = 'git tag --points-at HEAD'.execute().in.text.toString().trim()
     def currentBranch = 'git rev-parse --abbrev-ref HEAD'.execute().in.text.toString().trim()
diff --git a/release.gradle b/release.gradle
diff --git a/reporters/build.gradle b/reporters/build.gradle
@@ -46,4 +46,3 @@ dependencies {
     testImplementation 'org.robolectric:robolectric:4.4'
 }
 
-apply from: rootProject.file('release.gradle')
diff --git a/serializers/build.gradle b/serializers/build.gradle
@@ -45,4 +45,3 @@ dependencies {
     testImplementation 'org.robolectric:robolectric:4.4'
 }
 
-apply from: rootProject.file('release.gradle')

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ buildscript {`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`dependencies {`
`15`		`- classpath 'com.android.tools.build:gradle:3.5.0'`
	`15`	`+ classpath 'com.android.tools.build:gradle:7.2.0'`
`16`	`16`	`classpath "org.jfrog.buildinfo:build-info-extractor-gradle:4.28.3"`
`17`	`17`	`}`
`18`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,3 @@`
`1`	`1`	`VERSION_NAME=1.0.0`
`2`	`2`	`GROUP=com.facebook.battery`
	`3`	`+android.useAndroidX=true`
Original file line number	Diff line number	Diff line change
`@@ -45,8 +45,6 @@ dependencies {`
`45`	`45`	`testImplementation 'org.powermock:powermock-module-junit4:2.0.2'`
`46`	`46`	`}`
`47`	`47`
`48`		`-apply from: rootProject.file('release.gradle')`
`49`		`-`
`50`	`48`	`ext.versionName = { ->`
`51`	`49`	`def currentTag = 'git tag --points-at HEAD'.execute().in.text.toString().trim()`
`52`	`50`	`def currentBranch = 'git rev-parse --abbrev-ref HEAD'.execute().in.text.toString().trim()`
Original file line number	Diff line number	Diff line change
`@@ -46,4 +46,3 @@ dependencies {`
`46`	`46`	`testImplementation 'org.robolectric:robolectric:4.4'`
`47`	`47`	`}`
`48`	`48`
`49`		`-apply from: rootProject.file('release.gradle')`
Original file line number	Diff line number	Diff line change
`@@ -45,4 +45,3 @@ dependencies {`
`45`	`45`	`testImplementation 'org.robolectric:robolectric:4.4'`
`46`	`46`	`}`
`47`	`47`
`48`		`-apply from: rootProject.file('release.gradle')`