Skip to content

Commit 96fb731

Browse files
Update Gradle to 7.4.2 and Android Gradle plugin to 7.2.1
1 parent 2a8eb64 commit 96fb731

File tree

5 files changed

+28
-38
lines changed

5 files changed

+28
-38
lines changed

Diff for: android-database-sqlcipher/build.gradle

+2
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,12 @@ android {
2424
buildTypes {
2525
debug {
2626
debuggable true
27+
buildConfigField("String", "VERSION_NAME", "\"${clientVersionNumber}\"")
2728
}
2829
release {
2930
debuggable false
3031
minifyEnabled false
32+
buildConfigField("String", "VERSION_NAME", "\"${clientVersionNumber}\"")
3133
}
3234
}
3335

Diff for: android-database-sqlcipher/maven.gradle

+21-35
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
apply plugin: "maven"
1+
apply plugin: "maven-publish"
22
apply plugin: "signing"
33
import org.gradle.plugins.signing.Sign
44

@@ -36,56 +36,42 @@ gradle.taskGraph.whenReady { taskGraph ->
3636
}
3737
}
3838

39-
afterEvaluate { project ->
40-
uploadArchives {
41-
repositories {
42-
mavenDeployer {
43-
beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
44-
45-
pom.groupId = mavenGroup
46-
pom.artifactId = mavenArtifactId
47-
pom.version = mavenVersionName
48-
49-
repository(url: getReleaseRepositoryUrl()) {
50-
authentication(userName: getRepositoryUsername(), password: getRepositoryPassword())
51-
}
52-
snapshotRepository(url: getSnapshotRepositoryUrl()) {
53-
authentication(userName: getRepositoryUsername(), password: getRepositoryPassword())
54-
}
55-
56-
pom.project {
57-
name mavenArtifactId
58-
packaging mavenPackaging
59-
description mavenPomDescription
60-
url mavenPomUrl
6139

62-
scm {
63-
url mavenScmUrl
64-
connection mavenScmConnection
65-
developerConnection mavenScmDeveloperConnection
66-
}
6740

41+
afterEvaluate { project ->
42+
publishing {
43+
publications {
44+
mavenJava(MavenPublication) {
45+
groupId = mavenGroup
46+
artifactId = mavenArtifactId
47+
version = mavenPomDescription
48+
pom {
49+
name = mavenArtifactId
50+
description = mavenPomDescription
51+
url = mavenPomUrl
6852
licenses {
6953
license {
70-
url mavenLicenseUrl
54+
url = mavenLicenseUrl
7155
}
7256
}
73-
7457
developers {
7558
developer {
76-
name mavenDeveloperName
77-
email mavenDeveloperEmail
78-
organization mavenDeveloperOrganization
79-
organizationUrl mavenDeveloperUrl
59+
name = mavenDeveloperName
60+
email = mavenDeveloperEmail
8061
}
8162
}
63+
scm {
64+
connection = mavenScmConnection
65+
developerConnection = mavenScmDeveloperConnection
66+
url = mavenScmUrl
67+
}
8268
}
8369
}
8470
}
8571
}
8672

8773
signing {
88-
required { isReleaseBuild() && gradle.taskGraph.hasTask("uploadArchives") }
74+
required { isReleaseBuild() }
8975
sign configurations.archives
9076
}
9177

Diff for: build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ buildscript {
77
}
88
}
99
dependencies {
10-
classpath "com.android.tools.build:gradle:3.4.1"
10+
classpath 'com.android.tools.build:gradle:7.2.1'
1111
classpath "gradle.plugin.org.ec4j.gradle:editorconfig-gradle-plugin:0.0.3"
1212
}
1313
}

Diff for: gradle.properties

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
android.useAndroidX=true

Diff for: gradle/wrapper/gradle-wrapper.properties

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1+
#Fri Jul 08 11:01:47 CDT 2022
12
distributionBase=GRADLE_USER_HOME
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
24
distributionPath=wrapper/dists
3-
zipStoreBase=GRADLE_USER_HOME
45
zipStorePath=wrapper/dists
5-
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-bin.zip
6+
zipStoreBase=GRADLE_USER_HOME

0 commit comments

Comments
 (0)