Skip to content

Commit 76e2fb3

Browse files
chore(cli): Stop passing deprecated parameters (#1015)
* chore(cli): Stop passing deprecated parameters Fixes #1012 Fixes GRADLE-67 * Remove code for backwards-compatibility testing This test code was added in #576. It ensures that the Gradle plugin gracefully handles the case where we attempt to upload a ProGuard mapping, with release association, to a self-hosted instance which does not yet support ProGuard release association. Since we no longer will support ProGuard release association in the Gradle plugin, this test code has become irrelevant.
1 parent 461d37c commit 76e2fb3

File tree

4 files changed

+1
-30
lines changed

4 files changed

+1
-30
lines changed

plugin-build/src/main/kotlin/io/sentry/android/gradle/tasks/SentryUploadProguardMappingsTask.kt

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -77,17 +77,6 @@ abstract class SentryUploadProguardMappingsTask : SentryCliExecTask() {
7777
if (!autoUploadProguardMapping.get()) {
7878
args.add("--no-upload")
7979
}
80-
81-
releaseInfo.get().let {
82-
it.versionCode?.let { versionCode ->
83-
args.add("--version-code")
84-
args.add(versionCode.toString())
85-
}
86-
args.add("--app-id")
87-
args.add(it.applicationId)
88-
args.add("--version")
89-
args.add(it.versionName)
90-
}
9180
}
9281

9382
companion object {

plugin-build/src/test/kotlin/io/sentry/android/gradle/integration/SentryPluginIntegrationTest.kt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,6 @@ class SentryPluginIntegrationTest :
4646
build.task(":app:uploadSentryProguardMappingsRelease")?.outcome,
4747
TaskOutcome.SUCCESS,
4848
)
49-
assertTrue(build.output) {
50-
"Most likely you have to update your self-hosted Sentry version " +
51-
"to get all of the latest features." in build.output
52-
}
5349
}
5450

5551
@Test

plugin-build/src/test/kotlin/io/sentry/android/gradle/tasks/SentryUploadProguardMappingTaskTest.kt

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,6 @@ class SentryUploadProguardMappingTaskTest {
4949
assertTrue("--uuid" in args)
5050
assertTrue(randomUuid.toString() in args)
5151
assertTrue(mappingFile.get().first().toString() in args)
52-
assertTrue("--app-id" in args)
53-
assertTrue(releaseInfo.applicationId in args)
54-
assertTrue("--version" in args)
55-
assertTrue(releaseInfo.versionName in args)
56-
assertTrue("--version-code" in args)
57-
assertTrue(releaseInfo.versionCode.toString() in args)
5852
assertFalse("--no-upload" in args)
5953
}
6054

@@ -85,11 +79,6 @@ class SentryUploadProguardMappingTaskTest {
8579
assertTrue("--uuid" in args)
8680
assertTrue(randomUuid.toString() in args)
8781
assertTrue(mappingFile.get().first().toString() in args)
88-
assertTrue("--app-id" in args)
89-
assertTrue(releaseInfo.applicationId in args)
90-
assertTrue("--version" in args)
91-
assertTrue(releaseInfo.versionName in args)
92-
assertFalse("--version-code" in args)
9382
assertFalse("--no-upload" in args)
9483
assertFalse("--log-level=debug" in args)
9584
}

test/integration-test-server.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,7 @@ def do_GET(self):
4242
self.flushLogs()
4343

4444
def do_POST(self):
45-
if self.isApi('/api/0/projects/{}/{}/files/proguard-artifact-releases/'.format(apiOrg, apiProject)):
46-
self.start_response(HTTPStatus.NOT_FOUND)
47-
else:
48-
self.start_response(HTTPStatus.OK)
45+
self.start_response(HTTPStatus.OK)
4946

5047
if self.isApi('api/0/projects/{}/{}/files/difs/assemble/'.format(apiOrg, apiProject)):
5148
# Request body example:

0 commit comments

Comments
 (0)