Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
base: 2baf41b0d453
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 56e5dad3d8bb
Choose a head ref
  • 4 commits
  • 1 file changed
  • 1 contributor

Commits on Aug 17, 2019

  1. androidStudioPackages.{dev,canary}: 3.6.0.3 -> 3.6.0.4

    @primeos
    primeos committed Aug 17, 2019
    Copy the full SHA
    7aa0222 View commit details
    Browse the repository at this point in the history

  2. androidStudioPackages.{dev,canary}: 3.6.0.4 -> 3.6.0.5

    @primeos
    primeos committed Aug 17, 2019
    Copy the full SHA
    b58bfbd View commit details
    Browse the repository at this point in the history

  3. androidStudioPackages.{dev,canary}: 3.6.0.5 -> 3.6.0.6 

    Unfortunately this update will probably still cause the builds from
canary 3 to break and require manual steps to resolve these issues:
https://issuetracker.google.com/issues/136077720#comment9

I.e. manually update the Gradle plugin here (e.g. directly to alpha06):
dependencies {
   classpath 'com.android.tools:gradle:3.6.0-alpha03'
}

But as the current status is "Won't Fix (Infeasible)" [0] there's no
point in skipping the updates for the dev/canary channel.

[0]: https://issuetracker.google.com/issues/136077720#comment10
    @primeos
    primeos committed Aug 17, 2019
    Copy the full SHA
    7a66c79 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'android-studio-canary-updates' into master 

    This commit merges the following updates for
androidStudioPackages.{dev,canary}:

* androidStudioPackages.{dev,canary}: 3.6.0.5 -> 3.6.0.6
* androidStudioPackages.{dev,canary}: 3.6.0.4 -> 3.6.0.5
* androidStudioPackages.{dev,canary}: 3.6.0.3 -> 3.6.0.4

These updates where initially delayed due to a bug that causes problems
with the automatic update of the Android Studio Gradle plugin.
But as the current status is "Won't Fix (Infeasible)" [0] there's no
point in skipping the updates for the dev/canary channel any longer.

Unfortunately this update will probably still cause the builds from
canary 3 to break and require manual steps to resolve this issue.
The required manual steps can be found here:
https://issuetracker.google.com/issues/136077720#comment9

I.e. manually update the Gradle plugin here (e.g. directly to alpha06):
dependencies {
   classpath 'com.android.tools:gradle:3.6.0-alpha03'
}

[0]: https://issuetracker.google.com/issues/136077720#comment10
    @primeos
    primeos committed Aug 17, 2019
    Copy the full SHA
    56e5dad View commit details
    Browse the repository at this point in the history