Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Chore] Merge develop into sep-6 #1168

Merged
merged 18 commits into from
Oct 19, 2023
Merged

Conversation

philipliu
Copy link
Contributor

Description

Merge develop into sep-6.

Context

sep-6 will be released soon.

Testing

  • ./gradlew test

Known limitations

N/A

lijamie98 and others added 16 commits September 21, 2023 08:50
…r#1114)

[ANCHOR-470] Upgrade Stellar Java SDK to `0.41.0`
### Description

release 2.3.0

---------

Co-authored-by: Jamie Li <[email protected]>
 Merge `release/2.3.0` to `develop`
### Description

- Add `lockAndMockStatic` function 
- For `mockkStatic`, protect the critical section with
`lockAndMockStatic`.
### Description

- Fix bug of missing asset in JWT when no asset issuer is specified

### Context

- Instead of parsing asset again, pass asset info to interactive url
constructor

### Testing

- `./gradlew test`
- Added test to reproduce this behavior

### Known limitations

N/A
…r#1165)

### Description

Add ability to pass JVM flags to docker container

### Context

Currently, we can't pass flags to the java command running in the
container

### Testing

Manual testing: checked passing flags is working 

### Known limitations

N/A
### Description

Bump test version to latest
… JWT (stellar#1164)

### Description
Add `home_domain` to Sep10 JWT and Sep24 interactive URL JWT
### Context
To support multi-tenancy of SDP.
…lar#1167)

### Description

Add @LockAndMockStatic and @LockStatic annotations. Instead of 
```kotlin
class MyTest {
  @LockAndMockStatic([NetUtil::class]) 
  fun myTest(){
    lockAndMockStatic() {
      // my tests here
   }
  }
}
```
the test method can be annotated with `@LockAndMockStatic`

```kotlin
@ExtendWith(LockAndMockTest::class) 
class MyTest {
  @LockAndMockStatic([NetUtil::class]) 
  fun myTest(){
  }
}
```
@philipliu philipliu changed the base branch from develop to sep-6 October 19, 2023 13:25
@philipliu philipliu marked this pull request as ready for review October 19, 2023 15:52
@philipliu philipliu merged commit f29e9c9 into stellar:sep-6 Oct 19, 2023
@philipliu philipliu deleted the sep-6-10-19-merge branch October 19, 2023 20:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants