Skip to content

Commit c276b3b

Browse files
committed
updates
1 parent 53fe7d6 commit c276b3b

File tree

19 files changed

+31
-29
lines changed

19 files changed

+31
-29
lines changed

README.md

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ An Avro example which makes use of builtin logicalType as well as adds a custom
77
```bash
88
# Create logicalType package first
99

10-
cd logicaltypes
10+
cd logical-types
1111
./gradlew build
1212

1313
# Next you can run the example project
@@ -167,20 +167,19 @@ public class StreetConversion extends Conversion<Street> {
167167

168168
```groovy
169169
plugins {
170-
id 'com.commercehub.gradle.plugin.avro' version '0.18.0'
170+
id 'com.commercehub.gradle.plugin.avro' version '1.8.0'
171171
}
172172
173173
dependencies {
174-
implementation 'org.apache.avro:avro:1.9.2'
174+
implementation 'org.apache.avro:avro:1.11.2'
175175
}
176176
177177
avro {
178178
enableDecimalLogicalType = true
179-
dateTimeLogicalType = "JSR310"
180179
stringType = "String"
181180
outputCharacterEncoding = "UTF-8"
182-
logicalTypeFactory("street", de.mh.examples.avro.StreetLogicalTypeFactory)
183-
customConversion(de.mh.examples.avro.StreetConversion)
181+
logicalTypeFactory("street", "de.mh.examples.avro.StreetLogicalTypeFactory")
182+
customConversion("de.mh.examples.avro.StreetConversion")
184183
}
185184
```
186185

example/build.gradle

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,37 @@
11
buildscript {
22
dependencies {
3-
classpath files('../logicaltypes/build/libs/logicaltypes-1.0.0.jar')
3+
classpath files('../logical-types/build/libs/logical-types.jar')
44
}
55
}
66

77
plugins {
88
id 'java'
99
id 'idea'
10-
id 'com.github.davidmc24.gradle.plugin.avro' version '1.5.0'
10+
id 'com.github.davidmc24.gradle.plugin.avro' version '1.8.0'
1111
}
1212

1313
repositories {
1414
mavenCentral()
1515
}
1616

17-
sourceCompatibility = JavaVersion.VERSION_17
18-
targetCompatibility = JavaVersion.VERSION_17
17+
java {
18+
toolchain {
19+
languageVersion = JavaLanguageVersion.of(17)
20+
}
21+
}
1922

2023
dependencies {
21-
implementation 'org.apache.avro:avro:1.11.1'
22-
implementation files('../logicaltypes/build/libs/logicaltypes-1.0.0.jar')
24+
implementation 'org.apache.avro:avro:1.11.2'
25+
implementation files('../logical-types/build/libs/logical-types.jar')
2326
implementation 'ch.qos.logback:logback-classic:1.4.4'
2427
}
2528

2629
avro {
2730
enableDecimalLogicalType = true
2831
stringType = "String"
2932
outputCharacterEncoding = "UTF-8"
30-
logicalTypeFactory("street", de.mh.examples.avro.StreetLogicalTypeFactory)
31-
customConversion(de.mh.examples.avro.StreetConversion)
33+
logicalTypeFactory("street", "de.mh.examples.avro.StreetLogicalTypeFactory")
34+
customConversion("de.mh.examples.avro.StreetConversion")
3235
}
3336

3437
wrapper {

example/gradle.properties

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
version=1.0.0
1+
name=avro-example
2+
version=1.0.0
Lines changed: 1 addition & 1 deletion
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-7.5.1-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

example/settings.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ pluginManagement {
88
url "https://dl.bintray.com/gradle/gradle-plugins"
99
}
1010
}
11-
}
11+
}

example/src/main/java/de/mh/examples/avro/AvroExamples.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import java.io.File;
1414
import java.io.IOException;
1515
import java.math.BigDecimal;
16+
import java.math.RoundingMode;
1617

1718
public class AvroExamples {
1819

@@ -33,10 +34,10 @@ public static void main(String[] args) throws IOException {
3334

3435
User user2 = User.newBuilder()
3536
.setName("Jon Doe")
36-
.setSalary(BigDecimal.valueOf(90000.00).setScale(2))
37+
.setSalary(BigDecimal.valueOf(90000.00).setScale(2, RoundingMode.UNNECESSARY))
3738
.setAddress(Address.newBuilder()
3839
.setCity("Buxtehude")
39-
.setStreet(new Street("Anyhwere", "10"))
40+
.setStreet(new Street("Anywhere", "10"))
4041
.setZipcode("75869")
4142
.build())
4243
.build();

gradle/wrapper/gradle-wrapper.jar

-53.9 KB
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

Lines changed: 0 additions & 5 deletions
This file was deleted.

logicaltypes/build.gradle renamed to logical-types/build.gradle

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,14 @@ repositories {
77
mavenCentral()
88
}
99

10-
sourceCompatibility = JavaVersion.VERSION_17
11-
targetCompatibility = JavaVersion.VERSION_17
10+
java {
11+
toolchain {
12+
languageVersion = JavaLanguageVersion.of(17)
13+
}
14+
}
1215

1316
dependencies {
14-
implementation 'org.apache.avro:avro:1.11.1'
17+
implementation 'org.apache.avro:avro:1.11.2'
1518
}
1619

1720
wrapper {

logical-types/gradle.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
name=logical-types

0 commit comments

Comments
 (0)