Skip to content

Commit 3913e98

Browse files
authored
Merge pull request #58 from Snapchat/fai/bump_dagger
Upgrade to dagger 2.56.2
2 parents ba62b57 + 9d5237e commit 3913e98

File tree

5 files changed

+41
-35
lines changed

5 files changed

+41
-35
lines changed

plugin/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
GROUP=com.snap.daggerbrowser
2-
VERSION_NAME=0.7
2+
VERSION_NAME=0.8
33

44
POM_DESCRIPTION=DaggerBrowser
55

plugin/gradle/gradle-mvn-push.gradle

Lines changed: 35 additions & 29 deletions
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

44
def isReleaseBuild() {
@@ -24,53 +24,59 @@ def getRepositoryPassword() {
2424
}
2525

2626
afterEvaluate { project ->
27-
uploadArchives {
28-
repositories {
29-
mavenDeployer {
30-
beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
27+
publishing {
28+
publications {
29+
mavenJava(MavenPublication) {
3130

32-
pom.groupId = GROUP
33-
pom.artifactId = POM_ARTIFACT_ID
34-
pom.version = VERSION_NAME
31+
groupId = GROUP
32+
artifactId = POM_ARTIFACT_ID
33+
version = VERSION_NAME
3534

36-
repository(url: getReleaseRepositoryUrl()) {
37-
authentication(userName: getRepositoryUsername(), password: getRepositoryPassword())
38-
}
39-
snapshotRepository(url: getSnapshotRepositoryUrl()) {
40-
authentication(userName: getRepositoryUsername(), password: getRepositoryPassword())
41-
}
42-
43-
pom.project {
44-
name POM_NAME
45-
packaging POM_PACKAGING
46-
description POM_DESCRIPTION
47-
url POM_URL
35+
pom {
36+
name = POM_NAME
37+
packaging = POM_PACKAGING
38+
description = POM_DESCRIPTION
39+
url = POM_URL
4840

4941
scm {
50-
url POM_SCM_URL
51-
connection POM_SCM_CONNECTION
52-
developerConnection POM_SCM_DEV_CONNECTION
42+
url = POM_SCM_URL
43+
connection = POM_SCM_CONNECTION
44+
developerConnection = POM_SCM_DEV_CONNECTION
5345
}
5446

5547
licenses {
5648
license {
57-
name POM_LICENCE_NAME
58-
url POM_LICENCE_URL
59-
distribution POM_LICENCE_DIST
49+
name = POM_LICENCE_NAME
50+
url = POM_LICENCE_URL
51+
distribution = POM_LICENCE_DIST
6052
}
6153
}
6254

6355
developers {
6456
developer {
65-
id POM_DEVELOPER_ID
66-
name POM_DEVELOPER_NAME
57+
id = POM_DEVELOPER_ID
58+
name = POM_DEVELOPER_NAME
6759
}
6860
}
61+
scm {
62+
connection = 'scm:git:git://github.com/Snapchat/dagger-browser.git'
63+
developerConnection = 'scm:git:ssh://github.com/Snapchat/dagger-browser.git'
64+
url = 'https://github.com/Snapchat/dagger-browser'
65+
}
6966
}
70-
7167
}
7268
}
69+
repositories {
70+
maven {
71+
url = isReleaseBuild() ? getReleaseRepositoryUrl() : getSnapshotRepositoryUrl()
72+
73+
credentials {
74+
username = getRepositoryUsername()
75+
password = getRepositoryPassword()
76+
}
77+
}
7378
}
79+
}
7480

7581
signing {
7682
required { isReleaseBuild() && gradle.taskGraph.hasTask("uploadArchives") }

plugin/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-all.zip

plugin/lib/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ dependencies {
1212
sourceCompatibility = "8"
1313
targetCompatibility = "8"
1414
buildscript {
15-
ext.kotlin_version = '1.3.61'
16-
ext.dagger_version = '2.25.4'
15+
ext.kotlin_version = '2.1.0'
16+
ext.dagger_version = '2.56.2'
1717
ext.moshi_version = '1.9.2'
1818

1919
repositories {

plugin/sample/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apply plugin: 'java-library'
22

33
dependencies {
4-
implementation 'com.google.dagger:dagger:2.25.2'
5-
annotationProcessor "com.google.dagger:dagger-compiler:2.25.2"
4+
implementation 'com.google.dagger:dagger:2.56.2'
5+
annotationProcessor "com.google.dagger:dagger-compiler:2.56.2"
66
annotationProcessor project(":lib")
77
}

0 commit comments

Comments
 (0)