Skip to content

Commit 0c8ba03

Browse files
Merge pull request #66 from aminghadersohi/bump_versions
Update dependency libraries
2 parents d432b0e + 85e43b6 commit 0c8ba03

File tree

10 files changed

+24
-107
lines changed

10 files changed

+24
-107
lines changed

CHANGELOG.md

-63
This file was deleted.

build.gradle.kts

-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ allprojects {
1515
group = project.group
1616
version = project.version
1717
repositories {
18-
jcenter()
1918
mavenCentral()
2019
}
2120
tasks.withType<KotlinCompile> {

buildSrc/src/main/kotlin/Libs.kt

+10-10
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,17 @@
44

55
object Libs {
66
object Versions {
7-
const val clikt = "3.0.1"
8-
const val detektGradlePlugin = "1.14.2"
9-
const val dokkaGradlePlugin = "1.4.10.2"
7+
const val clikt = "3.3.0"
8+
const val detektGradlePlugin = "1.18.1"
9+
const val dokkaGradlePlugin = "1.5.31"
1010
const val googleJavaFormatCli = "1.7"
11-
const val gradlePluginPublish = "0.12.0"
12-
const val junit = "4.13.1"
13-
const val kotlin = "1.4.10"
14-
const val ktlint = "0.39.0"
15-
const val ktlintGradlePlugin = "9.4.1"
16-
const val snakeyaml = "1.27"
17-
const val vanniktechMavenPublish = "0.13.0"
11+
const val gradlePluginPublish = "0.17.0"
12+
const val junit = "4.13.2"
13+
const val kotlin = "1.5.31"
14+
const val ktlint = "0.43.0"
15+
const val ktlintGradlePlugin = "10.2.0"
16+
const val snakeyaml = "1.29"
17+
const val vanniktechMavenPublish = "0.18.0"
1818
}
1919

2020
const val clikt = "com.github.ajalt.clikt:clikt:${Versions.clikt}"

core/src/main/kotlin/com/tinder/gitquery/core/GitQueryInit.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ object GitQueryInit {
7575
): HashMap<String, Any> {
7676
val actualRepoPath = Paths.get(actualRepoDirectory)
7777
var repoHeadRevision = revision.ifEmpty { repoHeadRevision(actualRepoDirectory, verbose = verbose) }
78-
if (repoHeadRevision.toUpperCase() == "HEAD") {
78+
if (repoHeadRevision.uppercase() == "HEAD") {
7979
repoHeadRevision = repoHeadRevision(actualRepoDirectory, verbose = verbose)
8080
}
8181

core/src/main/kotlin/com/tinder/gitquery/core/GitQueryVersion.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ package com.tinder.gitquery.core
44
* This file was generated by ./build-support/bin/write-version-class
55
*/
66

7-
const val GIT_QUERY_VERSION = "3.0.10"
7+
const val GIT_QUERY_VERSION = "3.0.11-SNAPSHOT"

gradle-plugin/src/test/kotlin/com/tinder/gitquery/GitQueryInitTaskTest.kt

-17
Original file line numberDiff line numberDiff line change
@@ -96,21 +96,4 @@ files:
9696
user.proto: 42933446d0321958e8c12216d04b9f0c382ebf1b
9797
9898
""".trimIndent()
99-
100-
private fun getContentMissingRemoteConfig() =
101-
"""
102-
---
103-
schema:
104-
version: 1
105-
branch: master
106-
files:
107-
definitions:
108-
user.proto: 42933446d0321958e8c12216d04b9f0c382ebf1b
109-
""".trimIndent()
110-
111-
private fun getContentWrongFormat() =
112-
"""---
113-
master{ }
114-
incorrectFormat
115-
""".trimIndent()
11699
}

gradle.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ org.gradle.daemon=true
77
org.gradle.parallel=true
88

99
GROUP=com.tinder.gitquery
10-
VERSION_NAME=3.0.10
10+
VERSION_NAME=3.0.11-SNAPSHOT
1111

1212
POM_DESCRIPTION=A library for querying and syncing files in a remote git repo.
1313
POM_URL=https://github.com/Tinder/GitQuery
+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

samples/protobuf-sync-code-gen/build.gradle.kts

+4-6
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import com.google.protobuf.gradle.protoc
88

99
plugins {
1010
application
11-
id("com.google.protobuf") version "0.8.13"
11+
id("com.google.protobuf") version "0.8.17"
1212
id("com.tinder.gitquery") version "3.0.10"
1313
java
1414
}
@@ -28,8 +28,6 @@ sourceSets {
2828
}
2929
}
3030

31-
val protobufVersion by extra("3.14.0")
32-
3331
repositories {
3432
jcenter()
3533
if (System.getenv("CI") == "true") {
@@ -39,18 +37,18 @@ repositories {
3937
}
4038

4139
application {
42-
mainClassName = "com.examples.addressbook.MainKt"
40+
mainClass.set("com.examples.addressbook.MainKt")
4341
applicationName = "addressbook"
4442
}
4543

4644
dependencies {
47-
implementation("com.google.protobuf:protobuf-java:3.14.0")
45+
implementation("com.google.protobuf:protobuf-java:3.19.1")
4846
}
4947

5048
protobuf {
5149
generatedFilesBaseDir = "$projectDir/src"
5250
protoc {
53-
artifact = "com.google.protobuf:protoc:$protobufVersion"
51+
artifact = "com.google.protobuf:protoc:3.19.1"
5452
}
5553
generateProtoTasks {
5654
ofSourceSet("main").forEach { task ->

samples/protobuf-sync-code-gen/src/main/java/com/example/tutorial/AddressBookProtos.java

+6-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)