Skip to content

Commit d75f8f2

Browse files
buenaflorbuenaflor
authored
Merge branch 'main' into deps/upgrade-kotlin
2 parents b1d21e5 + f354280 commit d75f8f2

File tree

16 files changed

+341
-85
lines changed

16 files changed

+341
-85
lines changed

‎.craft.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ targets:
66
gradleCliPath: ./gradlew
77
mavenCliPath: scripts/mvnw
88
mavenSettingsPath: scripts/settings.xml
9-
mavenRepoId: ossrh
10-
mavenRepoUrl: https://oss.sonatype.org/service/local/staging/deploy/maven2/
9+
mavenRepoId: ossrh-staging-api
10+
mavenRepoUrl: https://ossrh-staging-api.central.sonatype.com/service/local/staging/deploy/maven2/
1111
android:
1212
distDirRegex: /^(sentry-android-|.*-android).*$/
1313
fileReplaceeRegex: /\d+\.\d+\.\d+(-\w+(\.\d+)?)?(-SNAPSHOT)?/
@@ -21,13 +21,13 @@ targets:
2121
gradleCliPath: ./gradlew
2222
mavenCliPath: scripts/mvnw
2323
mavenSettingsPath: scripts/settings.xml
24-
mavenRepoId: ossrh
25-
mavenRepoUrl: https://oss.sonatype.org/service/local/staging/deploy/maven2/
24+
mavenRepoId: ossrh-staging-api
25+
mavenRepoUrl: https://ossrh-staging-api.central.sonatype.com/service/local/staging/deploy/maven2/
2626
android: false
2727
includeNames: /sentry-kotlin-multiplatform-gradle-plugin.*$/
2828
- name: github
2929
- name: registry
3030
sdks:
3131
maven:io.sentry:sentry-kotlin-multiplatform:
32-
# maven:io.sentry:sentry-kotlin-multiplatform-gradle-plugin:
32+
maven:io.sentry:sentry-kotlin-multiplatform-gradle-plugin:
3333

‎.github/workflows/generate-dokka.yml‎

Lines changed: 54 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,54 @@
1-
name: Generate Dokka
2-
3-
on:
4-
release:
5-
types: [released]
6-
7-
# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
8-
permissions:
9-
contents: read
10-
pages: write
11-
id-token: write
12-
13-
jobs:
14-
generate-dokka:
15-
runs-on: ubuntu-latest
16-
environment:
17-
name: github-pages
18-
url: ${{ steps.deployment.outputs.page_url }}
19-
steps:
20-
- name: Checkout
21-
uses: actions/checkout@v4
22-
23-
- name: set up JDK 11
24-
uses: actions/setup-java@v4
25-
with:
26-
distribution: "adopt"
27-
java-version: "11"
28-
29-
- name: Cache Gradle packages
30-
uses: actions/cache@v4
31-
with:
32-
path: |
33-
~/.gradle/caches
34-
~/.gradle/wrapper
35-
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
36-
restore-keys: |
37-
${{ runner.os }}-gradle-
38-
39-
- name: Setup Pages
40-
uses: actions/configure-pages@v5
41-
42-
- name: Generate docs with dokka
43-
run: make generateDokka
44-
45-
- name: Upload artifact
46-
uses: actions/upload-pages-artifact@v3
47-
with:
48-
path: ${{ github.workspace }}/build/dokka/htmlMultiModule
49-
50-
- name: Deploy to GitHub Pages
51-
id: deployment
52-
uses: actions/deploy-pages@v1
1+
# Disable for now until we bump the kotlin version
2+
3+
#name: Generate Dokka
4+
#
5+
#on:
6+
# release:
7+
# types: [released]
8+
#
9+
## Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
10+
#permissions:
11+
# contents: read
12+
# pages: write
13+
# id-token: write
14+
#
15+
#jobs:
16+
# generate-dokka:
17+
# runs-on: ubuntu-latest
18+
# environment:
19+
# name: github-pages
20+
# url: ${{ steps.deployment.outputs.page_url }}
21+
# steps:
22+
# - name: Checkout
23+
# uses: actions/checkout@v4
24+
#
25+
# - name: set up JDK 11
26+
# uses: actions/setup-java@v4
27+
# with:
28+
# distribution: "adopt"
29+
# java-version: "11"
30+
#
31+
# - name: Cache Gradle packages
32+
# uses: actions/cache@v4
33+
# with:
34+
# path: |
35+
# ~/.gradle/caches
36+
# ~/.gradle/wrapper
37+
# key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
38+
# restore-keys: |
39+
# ${{ runner.os }}-gradle-
40+
#
41+
# - name: Setup Pages
42+
# uses: actions/configure-pages@v5
43+
#
44+
# - name: Generate docs with dokka
45+
# run: make generateDokka
46+
#
47+
# - name: Upload artifact
48+
# uses: actions/upload-pages-artifact@v3
49+
# with:
50+
# path: ${{ github.workspace }}/build/dokka/htmlMultiModule
51+
#
52+
# - name: Deploy to GitHub Pages
53+
# id: deployment
54+
# uses: actions/deploy-pages@v1

‎CHANGELOG.md‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,21 @@
11
# Changelog
22

3-
## Unreleased
3+
## 0.15.0
4+
5+
### Enhancements
6+
7+
- Gradle Plugin: implement conditional Cocoa linking for targets ([#421](https://github.com/getsentry/sentry-kotlin-multiplatform/pull/421), [#423](https://github.com/getsentry/sentry-kotlin-multiplatform/pull/423))
8+
9+
### Dependencies
10+
11+
- Bump Cocoa SDK from v8.53.1 to v8.53.2 ([#419](https://github.com/getsentry/sentry-kotlin-multiplatform/pull/419))
12+
- [changelog](https://github.com/getsentry/sentry-cocoa/blob/main/CHANGELOG.md#8532)
13+
- [diff](https://github.com/getsentry/sentry-cocoa/compare/8.53.1...8.53.2)
14+
- Bump Java SDK from v8.16.0 to v8.17.0 ([#418](https://github.com/getsentry/sentry-kotlin-multiplatform/pull/418))
15+
- [changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md#8170)
16+
- [diff](https://github.com/getsentry/sentry-java/compare/8.16.0...8.17.0)
17+
18+
## 0.14.0
419

520
### Dependencies
621

‎README.md‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ that can be used on Kotlin Multiplatform.
2020

2121
| Packages | Maven Central
2222
|-----------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
23-
| sentry-kotlin-multiplatform | [![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-kotlin-multiplatform/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-kotlin-multiplatform)
23+
| sentry-kotlin-multiplatform | [![Maven Central](https://maven-badges.sml.io/sonatype-central/io.sentry/sentry-kotlin-multiplatform/badge.svg?style=flat)](https://central.sonatype.com/artifact/io.sentry/sentry-kotlin-multiplatform)
24+
| sentry-kotlin-multiplatform-gradle-plugin | [![Maven Central](https://maven-badges.sml.io/sonatype-central/io.sentry/sentry-kotlin-multiplatform-gradle-plugin/badge.svg?style=flat)](https://central.sonatype.com/artifact/io.sentry/sentry-kotlin-multiplatform-gradle-plugin)
2425

2526
## Supported Platforms
2627

@@ -47,6 +48,8 @@ Use the Kotlin Multiplatform and Cocoa SDK combinations listed in the table belo
4748
| 0.11.0 | 8.44.0 |
4849
| 0.12.0 | 8.49.0 (Xcode 16.3 compatible) |
4950
| 0.13.0 | 8.49.1 |
51+
| 0.14.0 | 8.53.1 |
52+
| 0.15.0 | 8.53.2 |
5053

5154
## Usage
5255

‎buildSrc/src/main/java/Config.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@ object Config {
3333
object Libs {
3434
val kotlinStd = "org.jetbrains.kotlin:kotlin-stdlib"
3535

36-
val sentryJavaVersion = "8.16.0"
36+
val sentryJavaVersion = "8.17.0"
3737
val sentryAndroid = "io.sentry:sentry-android:$sentryJavaVersion"
3838
val sentryJava = "io.sentry:sentry:$sentryJavaVersion"
3939

40-
val sentryCocoaVersion = "8.53.1"
40+
val sentryCocoaVersion = "8.53.2"
4141
val sentryCocoa = "Sentry"
4242

4343
object Samples {

‎gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ android.useAndroidX=true
88
compose.version=1.3.1-rc01
99

1010
# Release information
11-
versionName=0.13.0
11+
versionName=0.15.0
1212

1313
# Increase memory for in-process compiler execution.
1414
org.gradle.jvmargs=-Xmx6g

‎scripts/bump-version.sh‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,48 @@ PLUGIN_GRADLE_FILEPATH="sentry-kotlin-multiplatform-gradle-plugin/gradle.propert
1818
VERSION_NAME_PATTERN="versionName"
1919
perl -pi -e "s/$VERSION_NAME_PATTERN=.*$/$VERSION_NAME_PATTERN=$NEW_VERSION/g" $GRADLE_FILEPATH
2020
perl -pi -e "s/$VERSION_NAME_PATTERN=.*$/$VERSION_NAME_PATTERN=$NEW_VERSION/g" $PLUGIN_GRADLE_FILEPATH
21+
22+
PODSPEC_FILEPATH='sentry-kotlin-multiplatform/sentry_kotlin_multiplatform.podspec'
23+
PODSPEC_CONTENT=$(cat $PODSPEC_FILEPATH)
24+
25+
PODSPEC_REGEX="('Sentry', *)'([0-9\.]+)'"
26+
27+
if ! [[ $PODSPEC_CONTENT =~ $PODSPEC_REGEX ]]; then
28+
echo "Failed to find the Cocoa version in $PODSPEC_FILEPATH"
29+
exit 1
30+
fi
31+
32+
PODSPEC_WHOLE_MATCH=${BASH_REMATCH[0]}
33+
PODSPEC_VAR_NAME=${BASH_REMATCH[1]}
34+
PODSPEC_VERSION=${BASH_REMATCH[2]}
35+
36+
# create a new table entry in readme with NEW_VERSION and PODSPEC_VERSION in the compatibility table
37+
# Find the line number of the last entry in the compatibility table and insert the new entry after it
38+
README_FILE="README.md"
39+
40+
# Check if an entry with the same KMP version and Cocoa version already exists
41+
EXISTING_ENTRY=$(grep "| $NEW_VERSION" $README_FILE 2>/dev/null | grep "$PODSPEC_VERSION" 2>/dev/null || true)
42+
43+
if [ -n "$EXISTING_ENTRY" ]; then
44+
echo "Found same KMP and Cocoaversion in the compatibility table. Skipping addition to avoid duplicate."
45+
exit 0
46+
fi
47+
48+
# We'll look for the last line that matches the table entry pattern (starts with | and contains version numbers)
49+
LAST_TABLE_LINE=$(grep -n "^| [0-9]" $README_FILE | tail -1 | cut -d: -f1)
50+
51+
if [ -z "$LAST_TABLE_LINE" ]; then
52+
echo "Could not find the last entry in the compatibility table"
53+
exit 1
54+
fi
55+
56+
TEMP_FILE=$(mktemp)
57+
58+
head -n $LAST_TABLE_LINE $README_FILE > $TEMP_FILE
59+
echo "| $NEW_VERSION | $PODSPEC_VERSION |" >> $TEMP_FILE
60+
tail -n +$((LAST_TABLE_LINE + 1)) $README_FILE >> $TEMP_FILE
61+
62+
# Replace the original file with the modified content
63+
mv $TEMP_FILE $README_FILE
64+
65+
echo "Added new compatibility table entry: | $NEW_VERSION | $PODSPEC_VERSION |"

‎scripts/settings.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
https://maven.apache.org/xsd/settings-1.0.0.xsd">
55
<servers>
66
<server>
7-
<id>ossrh</id>
7+
<id>ossrh-staging-api</id>
88
<username>${env.OSSRH_USERNAME}</username>
99
<password>${env.OSSRH_PASSWORD}</password>
1010
</server>

‎sentry-kotlin-multiplatform-gradle-plugin/build.gradle.kts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ dependencies {
2525
testImplementation(libs.junit)
2626
testImplementation(libs.junit.params)
2727
testImplementation(libs.mockk)
28+
testImplementation(libs.truth)
2829
}
2930

3031
tasks.test {

‎sentry-kotlin-multiplatform-gradle-plugin/gradle.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
id=io.sentry.kotlin.multiplatform.gradle
22
implementationClass=io.sentry.kotlin.multiplatform.gradle.SentryPlugin
3-
versionName=0.13.0
3+
versionName=0.15.0
44
group=io.sentry
5-
sentryCocoaVersion=8.53.1
5+
sentryCocoaVersion=8.53.2
66

77
# publication pom properties
88
POM_NAME=Sentry Kotlin Multiplatform Gradle Plugin

0 commit comments

Comments
 (0)