Merge pull request #416 from stellar/protocol_19

Protocol 19

CHANGELOG.md

@@ -2,6 +2,22 @@
 
 As this project is pre 1.0, breaking changes may happen for minor version bumps. A breaking change will get clearly notified in this log.
 
+## 0.32.0 (Pending)
+
+* Update XDR definitions and auto-generated classes to support upcoming protocol 19 release ([#416](https://github.com/stellar/java-stellar-sdk/pull/416)).
+* Extend StrKey implementation to handle [CAP 40 Payload Signer](https://github.com/stellar/stellar-protocol/blob/master/core/cap-0040.md).
+* Extended Transaction submission settings, additional new Preconditions can be added now, refer to [CAP 21 Transaction Preconditions](https://github.com/stellar/stellar-protocol/blob/master/core/cap-0021.md).
+
+### Breaking changes
+
+* org.stellar.sdk.Transaction.Builder
+ * deprecated `addTimeBounds()` use `addPreconditions()` instead
+ * deprecated `setTimeout()` use `addPreconditions()` instead
+ * deprecated `Transaction.Builder` use TransactionBuilder instead
+* org.stellar.sdk.Transaction
+ * `getSignatures()` returns an ImmutableList of signatures, do NOT add signatures to the collection returned.
+ use `addSignature(DecoratedSignature signature)` instead.
+
 ## 0.31.0
 
 * Fixed NPE on TrustlineCreatedEffectResponse.getAsset() for liquidity pool asset type.

build.gradle

@@ -1,90 +1,73 @@
 buildscript {
- ext.okhttpclientVersion="3.11.0"
- repositories {
- jcenter()
- }
- dependencies {
- classpath 'com.github.ben-manes:gradle-versions-plugin:0.20.0'
- classpath 'com.github.jengelman.gradle.plugins:shadow:2.0.4'
- }
+ ext.okhttpclientVersion= '3.11.0'
 }
 
-apply plugin: "com.github.johnrengelman.shadow" // provides shading 
-apply plugin: 'java'
-apply plugin: 'maven' // needed to add the install task for jitpack.io
-apply plugin: 'com.github.ben-manes.versions' // gradle dependencyUpdates -Drevision=release
-apply plugin: 'project-report' // gradle htmlDependencyReport
+plugins {
+ id "io.freefair.lombok" version "6.4.1"
+ id "com.github.johnrengelman.shadow" version "7.1.2"
+ id "java"
+ id "com.github.ben-manes.versions" version "0.42.0"
+ id "project-report"
+ id "maven-publish"
+ id "java-library"
+}
 
 sourceCompatibility = 1.6
-version = '0.31.0'
+version = '0.32.0'
 group = 'stellar'
+jar.enabled = false
 
-jar {
- manifest {
- attributes 'Implementation-Title': 'stellar-sdk',
- 'Implementation-Version': version
+publishing {
+ publications {
+ sdkLibrary(MavenPublication) { publication ->
+ project.shadow.component(publication)
+ }
  }
- archiveName 'stellar-sdk.jar'
- duplicatesStrategy DuplicatesStrategy.EXCLUDE
- from { configurations.compile.collect { it.isDirectory() ? it : zipTree(it) } }
 }
 
-artifacts {
- // make sure the non shaded jar is not 
- archives shadowJar
+shadowJar {
+ manifest {
+ attributes (
+ "Implementation-Title" : "stellar-sdk",
+ "Implementation-Version" : project.getVersion()
+ )
+ }
+ duplicatesStrategy DuplicatesStrategy.EXCLUDE
+ archiveClassifier.set('')
+ archiveBaseName.set('stellar-sdk')
+ relocate 'com.','shadow.com.'
+ relocate 'net.','shadow.net.'
+ relocate 'javax.annotation', 'shadow.javax.annotation'
+ relocate 'org.apache','shadow.org.apache'
+ relocate 'org.jvnet','shadow.org.jvnet'
+ relocate 'org.codehaus','shadow.org.codehaus'
+ relocate 'org.threeten','shadow.org.threeten'
+ relocate 'org.checkerframework','shadow.org.checkerframework'
+ relocate 'okhttp3','shadow.okhttp3'
+ relocate 'okio','shadow.okio'
 }
 
 repositories {
  mavenCentral()
 }
 
 dependencies {
- compile "com.squareup.okhttp3:okhttp:${okhttpclientVersion}"
- compile "com.squareup.okhttp3:okhttp-sse:${okhttpclientVersion}"
- compile 'com.moandjiezana.toml:toml4j:0.7.2'
+ implementation "com.squareup.okhttp3:okhttp:${okhttpclientVersion}"
+ implementation "com.squareup.okhttp3:okhttp-sse:${okhttpclientVersion}"
+ implementation 'com.moandjiezana.toml:toml4j:0.7.2'
  // use the android version because we don't want java 8 stuff
- compile 'com.google.guava:guava:26.0-android'
- compile 'com.google.code.gson:gson:2.8.5'
- compile 'commons-io:commons-io:2.6'
- compile 'net.i2p.crypto:eddsa:0.3.0'
- compile 'org.threeten:threetenbp:1.4.4'
-
- testCompile 'org.mockito:mockito-core:2.21.0'
- testCompile "com.squareup.okhttp3:mockwebserver:${okhttpclientVersion}"
- testCompile 'junit:junit:4.12'
- testCompile 'javax.xml.bind:jaxb-api:2.3.0'
-}
+ implementation 'com.google.guava:guava:26.0-android'
+ implementation 'com.google.code.gson:gson:2.8.5'
+ implementation 'commons-io:commons-io:2.6'
+ implementation 'net.i2p.crypto:eddsa:0.3.0'
+ implementation 'org.threeten:threetenbp:1.4.4'
 
-project.configurations.compile 
-jar.enabled = false
-
-// make sure the install task creates the shadowjar; this is called by jitpack.ios
-install.dependsOn(shadowJar);
-
-// we need this so we can get to the installer and deployer below so we can remove the dependencies
-uploadArchives {
- repositories {
- mavenDeployer {
- }
- }
+ testImplementation 'org.mockito:mockito-core:2.21.0'
+ testImplementation "com.squareup.okhttp3:mockwebserver:${okhttpclientVersion}"
+ testImplementation 'junit:junit:4.12'
+ testImplementation 'javax.xml.bind:jaxb-api:2.3.0'
+ testImplementation group: 'org.junit.vintage', name: 'junit-vintage-engine', version: '4.12.1'
 }
-
-def installer = install.repositories.mavenInstaller
-def deployer = uploadArchives.repositories.mavenDeployer
-[installer, deployer]*.pom*.whenConfigured {pom ->
- // force pom dependencies to be empty because we are shading everything
- pom.dependencies = []
-}
-
-shadowJar {
- archiveName 'stellar-sdk.jar' 
- relocate 'com.','shadow.com.'
- relocate 'net.','shadow.net.'
- relocate 'javax.annotation', 'shadow.javax.annotation'
- relocate 'org.apache','shadow.org.apache'
- relocate 'org.jvnet','shadow.org.jvnet'
- relocate 'org.codehaus','shadow.org.codehaus'
- relocate 'org.checkerframework','shadow.org.checkerframework'
- relocate 'okhttp3','shadow.okhttp3'
- relocate 'okio','shadow.okio'
+tasks.named('test') { task ->
+ useJUnitPlatform()
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists