-
-
Notifications
You must be signed in to change notification settings - Fork 35
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
Upgrade Android gradle plugin #633
Changes from 9 commits
fb38613
a15d817
40f7e8c
f00f3b5
dd531a2
d2b44a4
a7ceca4
62fd236
4d9c9d7
d7d15e1
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
distributionBase=GRADLE_USER_HOME | ||
distributionPath=wrapper/dists | ||
zipStoreBase=GRADLE_USER_HOME | ||
zipStorePath=wrapper/dists | ||
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -5,6 +5,7 @@ | |
|
||
<setBoolFromProperty result="bUploadSymbolsAutomatically" ini="Engine" section="/Script/Sentry.SentrySettings" property="UploadSymbolsAutomatically" default="false" /> | ||
<setBoolFromProperty result="bIncludeSources" ini="Engine" section="/Script/Sentry.SentrySettings" property="IncludeSources" default="false" /> | ||
<setBoolFromProperty result="bUseLegacyGradlePlugin" ini="Engine" section="/Script/Sentry.SentrySettings" property="UseLegacyGradlePlugin" default="false" /> | ||
|
||
<setStringFromProperty result="enabledBuildPlatforms" ini="Engine" section="/Script/Sentry.SentrySettings" property="EnableBuildPlatforms" default=""/> | ||
<setStringFromProperty result="enabledBuildConfigurations" ini="Engine" section="/Script/Sentry.SentrySettings" property="EnableBuildConfigurations" default=""/> | ||
|
@@ -34,6 +35,12 @@ | |
<true> | ||
<copyFile src="$S(ProjectDir)/sentry.properties" dst="$S(BuildDir)/gradle/sentry.properties" /> | ||
<copyFile src="$S(ProjectDir)/sentry.properties" dst="$S(BuildDir)/gradle/AFSProject/app/sentry.properties" /> | ||
<if condition="bUseLegacyGradlePlugin"> | ||
<false> | ||
<log text="Modifying engine's Gradle version used by replacing gradle-wrapper.properties"/> | ||
<copyFile src="$S(PluginDir)/../../Gradle/gradle-wrapper.properties" dst="$S(BuildDir)/gradle/gradle/wrapper/gradle-wrapper.properties" /> | ||
</false> | ||
</if> | ||
</true> | ||
</if> | ||
</prebuildCopies> | ||
|
@@ -70,6 +77,17 @@ | |
uploadNativeSymbols = true | ||
} | ||
</insert> | ||
<if condition="bUseLegacyGradlePlugin"> | ||
<false> | ||
<insert> | ||
sentry { | ||
autoInstallation { | ||
enabled = false | ||
} | ||
} | ||
</insert> | ||
</false> | ||
</if> | ||
<if condition="bIncludeSources"> | ||
<true> | ||
<insert> | ||
|
@@ -78,7 +96,7 @@ | |
} | ||
</insert> | ||
</true> | ||
</if> | ||
</if> | ||
</true> | ||
</if> | ||
</buildGradleAdditions> | ||
|
@@ -134,22 +152,30 @@ | |
</insert> | ||
</baseBuildGradleAdditions> | ||
|
||
<buildscriptGradleAdditions> | ||
<insert> | ||
dependencies { | ||
classpath 'com.android.tools.build:gradle:3.5.4' | ||
} | ||
</insert> | ||
</buildscriptGradleAdditions> | ||
|
||
<buildscriptGradleAdditions> | ||
<if condition="bUploadSymbols"> | ||
<true> | ||
<insert> | ||
dependencies { | ||
classpath 'io.sentry:sentry-android-gradle-plugin:2.1.5' | ||
} | ||
</insert> | ||
<if condition="bUseLegacyGradlePlugin"> | ||
<true> | ||
<log text="Using legacy Sentry Gradle plugin 2.1.5 for Android debug symbol upload."/> | ||
<insert> | ||
dependencies { | ||
classpath 'com.android.tools.build:gradle:3.5.4' | ||
classpath 'io.sentry:sentry-android-gradle-plugin:2.1.5' | ||
} | ||
</insert> | ||
</true> | ||
<false> | ||
<log text="Using Sentry Gradle plugin 4.11.0 for Android debug symbol upload."/> | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Is the hardcoded version number going to bite us in the butt later on? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Since we don't have any means allowing to check how Sentry Gradle plugin performs in our CI probably it'd be safer to keep a hardcoded version here instead of bumping it automatically for the time being. |
||
<log text="Enable legacy Sentry Gradle plugin in project settings in case current version conflicts with other plugins."/> | ||
<insert> | ||
dependencies { | ||
classpath 'com.android.tools.build:gradle:7.4.2' | ||
classpath 'io.sentry:sentry-android-gradle-plugin:4.11.0' | ||
} | ||
</insert> | ||
</false> | ||
</if> | ||
</true> | ||
</if> | ||
</buildscriptGradleAdditions> | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is that change intentional? The how do the
LinuxIntermediate
related toGradle
?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, aside from adding
Gradle
here I've also removedLinuxIntermediate
stuff which is now redundant (probably I've missed deleting these entries earlier). Should we tackle this kind of clean-up in a separate PR?