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

Merge release/1.12.0 branch into main branch #203

Merged
merged 19 commits into from
Oct 31, 2023

Conversation

0xnm
Copy link
Member

@0xnm 0xnm commented Oct 30, 2023

What does this PR do?

This PR does the merge of release/1.12.0 branch into main branch.

Review checklist (to be filled by reviewers)

  • Feature or bugfix MUST have appropriate tests (unit, integration, e2e)
  • Make sure you discussed the feature or bugfix with the maintaining team in an Issue
  • Make sure each commit and the PR mention the Issue number (cf the CONTRIBUTING doc)

0xnm and others added 19 commits September 13, 2023 13:53
…0-into-develop

Merge release 1.11.0 branch into develop branch
…1.11.0-in-sample-app

Use plugin version `1.11.0` for sample apps
Update Datadog SDK to version 2.2.0
Make plugin compatible with Kotlin Script
Lower log level from warning to info when no minification enabled
RUM-713 Allow customer to use non standard obfuscation
…adle-plugin-1.12.0

RUM-1957: Prepare release 1.12.0
@0xnm 0xnm requested review from a team as code owners October 30, 2023 15:46
Copy link

@urseberry urseberry left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Capitalization nit noted below.

@@ -44,6 +46,20 @@ datadog {
}
```

#### Kotlin Script

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
#### Kotlin Script
#### Kotlin script

@codecov-commenter
Copy link

codecov-commenter commented Oct 30, 2023

Codecov Report

Merging #203 (ed8fa24) into main (67614bb) will decrease coverage by 0.82%.
The diff coverage is 75.00%.

@@             Coverage Diff              @@
##               main     #203      +/-   ##
============================================
- Coverage     86.87%   86.05%   -0.82%     
- Complexity      178      181       +3     
============================================
  Files            21       21              
  Lines           579      588       +9     
  Branches         76       78       +2     
============================================
+ Hits            503      506       +3     
- Misses           49       55       +6     
  Partials         27       27              
Files Coverage Δ
.../datadog/gradle/plugin/DdExtensionConfiguration.kt 100.00% <100.00%> (ø)
...m/datadog/gradle/plugin/internal/OkHttpUploader.kt 84.03% <ø> (ø)
...com/datadog/gradle/plugin/DdAndroidGradlePlugin.kt 74.38% <88.24%> (-0.83%) ⬇️
...in/kotlin/com/datadog/gradle/plugin/DdExtension.kt 50.00% <20.00%> (-35.71%) ⬇️

@0xnm 0xnm merged commit d603d42 into main Oct 31, 2023
12 checks passed
@0xnm 0xnm deleted the nogorodnikov/merge-release-1.12.0-into-main branch October 31, 2023 13:47
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