Use compose version 20190806

Author: Mishkun

app/build.gradle

@@ -36,14 +36,15 @@ android {
 
 dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.30"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
     implementation "androidx.appcompat:appcompat:1.0.0"
     implementation "androidx.core:core-ktx:1.0.2"
-    implementation "androidx.compose:compose-runtime:1.0.0-alpha01"
+    implementation "androidx.compose:compose-runtime:$ui_version"
 
-    implementation "androidx.ui:ui-framework:1.0.0-alpha01"
-    implementation "androidx.ui:ui-material:1.0.0-alpha01"
-    implementation "androidx.ui:ui-layout:1.0.0-alpha01"
+    implementation "androidx.ui:ui-framework:$ui_version"
+    implementation "androidx.ui:ui-material:$ui_version"
+    implementation "androidx.ui:ui-layout:$ui_version"
 
     testImplementation "junit:junit:4.12"
     androidTestImplementation "androidx.test:runner:1.1.1"

build.gradle

@@ -1,6 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
-    ext.kotlin_version = "1.3.30-compose-20190520"
+    ext.kotlin_version = "1.3.50-compose-20190806"
+    ext.ui_version = "0.1.0-dev01"
     ext.androidx_home = project.properties["androidx.home"] ?: "$projectDir/androidx_prebuilts"
     repositories {
         maven { url "$androidx_home/out/ui/build/support_repo/" }

studio_versions.properties

@@ -1,6 +1,15 @@
-# This file specifies the version of the Android Gradle Plugin and Android Studio to use
-
-# version properties for studiow, which should correspond to the version of AGP
+# AGP override for the UI project. Normally we should be using the same version of AGP that is used
+# in AndroidX as a whole, but since we are currently using a separate studio build, we sometimes
+# end up updating one before the other. If this is specified, both ./studiow and ./gradlew will
+# use this version of AGP instead.
+#
+# If empty, the version of AGP from AndroidX will be used instead.
+#
+# Example value for this is: 3.5.0-beta05
+agp_override=3.5.0-beta05
+# Version properties for ./studiow, which should correspond to the version of AGP used either in
+# AndroidX, or specified above if overridden.
 studio_version=3.5.0.13
 idea_major_version=191
-studio_build_number=5677133
+idea_minor_version=7479.19.35
+studio_build_number=9626933

studiow

@@ -1,12 +1,14 @@
 #!/bin/bash
 set -e
+set -m
 
 # This is a wrapper script that runs the specific version of Android Studio that is recommended for developing in this repository.
 # (This serves a similar purpose to gradlew)
+#
+# NOTE: if you are changing this file, consider applying the changes to ../studiow, used for the main AndroidX project.
 
 
-function getStudioUrl() {
-  propertiesFile="${scriptDir}/studio_versions.properties"
+function getPrebuiltStudioZipPath() {
   version="$(grep "studio_version=" ${propertiesFile} | sed 's/[^=]*=//')"
   ideaMajorVersion="$(grep "idea_major_version=" ${propertiesFile} | sed 's/[^=]*=//')"
   buildNumber="$(grep "studio_build_number=" ${propertiesFile} | sed 's/[^=]*=//')"
@@ -16,8 +18,8 @@ function getStudioUrl() {
   else
     extension="zip"
   fi
-  studioUrl="https://dl.google.com/dl/android/studio/ide-zips/${version}/android-studio-ide-${ideaMajorVersion}.${buildNumber}-${osName}.${extension}"
-  echo "${studioUrl}"
+
+  echo "${scriptDir}/androidx_prebuilts/androidx/studio/android-studio-ide-${ideaMajorVersion}.${buildNumber}-${osName}.${extension}"
 }
 
 acceptsLicenseAgreement="$1"
@@ -35,10 +37,20 @@ function getOsName() {
   echo "${osName}"
 }
 osName="$(getOsName)"
-studioUrl="$(getStudioUrl $osName)"
-studioDestName="$(basename ${studioUrl})"
-studioZipPath="${tempDir}/${studioDestName}"
-studioUnzippedPath="$(echo ${studioZipPath} | sed 's/\.zip$//' | sed 's/\.tar.gz$//')"
+propertiesFile="${scriptDir}/studio_versions.properties"
+prebuiltStudioZipPath="$(getPrebuiltStudioZipPath $osName)"
+studioDestName="$(basename ${prebuiltStudioZipPath})"
+studioUnzippedPath="${tempDir}/${studioDestName}"
+studioUnzippedPath="$(echo ${studioUnzippedPath} | sed 's/\.zip$//' | sed 's/\.tar.gz$//')"
+
+# The version of AGP we should override with - may be empty if we should just use the default
+# version specified in AndroidX. See ui/studio_versions.properties.
+agp_override="$(grep "agp_override=" ${propertiesFile} | sed 's/[^=]*=//')"
+
+# Set the env variable if we have a valid version to override with, else noop
+GRADLE_PLUGIN_VERSION_OVERRIDE=""
+[ ! -z "$agp_override" ] && GRADLE_PLUGIN_VERSION_OVERRIDE="GRADLE_PLUGIN_VERSION=${agp_override}"
+
 
 function error_exit {
     echo "$1" >&2   ## Send message to stderr.
@@ -115,6 +127,16 @@ function checkLicenseAgreement() {
   fi
 }
 
+# Temporary fix. Remove this after fixing b/135183535
+function updateJvmHeapSize() {
+  if [ "${osName}" == "mac" ]; then
+    sed -i '' 's/-Xmx.*/-Xmx8g/' "$(findStudioMacAppPath)/Contents/bin/studio.vmoptions"
+  else
+    sed -i 's/-Xmx.*/-Xmx8g/' "${studioUnzippedPath}/android-studio/bin/studio64.vmoptions"
+    sed -i 's/-Xmx.*/-Xmx4g/' "${studioUnzippedPath}/android-studio/bin/studio.vmoptions"
+  fi
+}
+
 function updateStudio() {
   # skip if already up-to-date
   if stat "${studioUnzippedPath}" >/dev/null 2>/dev/null; then
@@ -123,73 +145,79 @@ function updateStudio() {
   fi
 
   mkdir -p "${tempDir}"
-  downloadFile "${studioUrl}" "${studioZipPath}"
-  echo
 
   echo "Removing previous installations"
   ls "${tempDir}" | grep -v "^${studioDestName}\$" | sed "s|^|${tempDir}/|" | xargs rm -rf
 
   echo "Unzipping"
   if [ "${osName}" == "linux" ]; then
     mkdir $studioUnzippedPath
-    tar -xzf "${studioZipPath}" --directory "${studioUnzippedPath}"
+    tar -xzf "${prebuiltStudioZipPath}" --directory "${studioUnzippedPath}"
   else
-    unzip "${studioZipPath}" -d "${studioUnzippedPath}"
+    unzip "${prebuiltStudioZipPath}" -d "${studioUnzippedPath}"
   fi
 }
 
-function ensureComposeAt() {
-  pluginPath=$1
-  copyOption=$2
-  idePluginJar="$pluginPath/r4a-ide-plugin.jar"
-  compilerPluginJar="$pluginPath/r4a-compiler-plugin.jar"
-  compilerPluginJarOutput="androidx_prebuilts/out/ui/build/support_repo/androidx/compose/compose-plugin-cli/1.0.0-alpha01/compose-plugin-cli-1.0.0-alpha01.jar"
-  idePluginJarOutput="androidx_prebuilts/out/ui/build/support_repo/androidx/compose/compose-plugin-ide/1.0.0-alpha01/compose-plugin-ide-1.0.0-alpha01.jar"
-  if [ ! -e "$idePluginJarOutput" ] || [ ! -e "$compilerPluginJarOutput" ]
-  then
-    echo "Building compose plugin"
-    ./gradlew :compose-plugin-ide:assemble :compose-plugin-cli:ideVersion
+# Copies the built compose-ide-plugin to the plugin directory of the studio installation. This
+# ensures that the compose plugin is used at startup
+function updateComposeIdePlugin() {
+  if [ "${osName}" == "mac" ]; then
+    composeIdePluginDirectory="$(findStudioMacAppPath)/Contents/plugins/compose-ide-plugin/"
+  else
+    composeIdePluginDirectory="${studioUnzippedPath}/android-studio/plugins/"
   fi
-  cp $copyOption "$compilerPluginJarOutput" "$compilerPluginJar"
-  cp $copyOption "$idePluginJarOutput" "$idePluginJar"
-}
+  # this is the idea sandbox directory that the compose ide plugin is located in
+  composePluginDirectory="${projectDir}/androidx_prebuilts/out/ui/compose/compose-ide-plugin/build/idea-sandbox/plugins/compose-ide-plugin/"
 
-function ensureComposeLinux() {
-  ensureComposeAt "${studioUnzippedPath}/android-studio/plugins/Kotlin/lib" "-u"
-}
-
-function ensureComposeMac() {
-  ensureComposeAt "$(findStudioMacAppPath)/Contents/plugins/Kotlin/lib"
+  echo ""
+  echo "Copying compose-ide-plugin to $composeIdePluginDirectory"
+  echo ""
+  mkdir -p "${composeIdePluginDirectory}"
+  cp -f -R "${composePluginDirectory}" "${composeIdePluginDirectory}"
 }
 
 function ensureCompose() {
-  # ensure compose plugin is up-to-date
-  if [ "${osName}" == "mac" ]; then
-    ensureComposeMac
-  else
-    ensureComposeLinux
-  fi
+  # This gradle command will prepare a sandbox directory that we can point studio to that will
+  # have all of the correct structure to load the compose plugin
+  ${scriptDir}/gradlew -p ${projectDir} :compose:compose-ide-plugin:prepareSandbox
 }
 
+# ANDROID_LINT_NULLNESS_IGNORE_DEPRECATED environment variable prevents Studio from showing IDE
+# inspection warnings for nullability issues, if the context is deprecated
+# This environment variable is consumed by InteroperabilityDetector.kt
+
 function runStudioLinux() {
   studioPath="${studioUnzippedPath}/android-studio/bin/studio.sh"
-  echo "$studioPath &"
+  updateComposeIdePlugin
+
+  echo ""
+  echo "Launching Studio"
+  # Override AGP version overridden because compose studio is behind androidx studio
   env STUDIO_PROPERTIES="${projectDir}/idea.properties" \
       STUDIO_VM_OPTIONS="${projectDir}/../development/studio/studio.vmoptions" \
-      KOTLIN_OVERRIDE="1.3.30-compose-20190503" \
+      ANDROID_LINT_NULLNESS_IGNORE_DEPRECATED="true" \
+      KOTLIN_OVERRIDE="1.3.50-compose-20190806" \
+      $GRADLE_PLUGIN_VERSION_OVERRIDE \
       "${studioPath}" "${projectDir}" &
 }
 
 function runStudioMac() {
   appPath="$(findStudioMacAppPath)"
-  echo "open ${appPath}"
+  updateComposeIdePlugin
+
+  echo ""
+  echo "Launching Studio"
+  # Override AGP version overridden because compose studio is behind androidx studio
   env STUDIO_PROPERTIES="${projectDir}/idea.properties" \
       STUDIO_VM_OPTIONS="${projectDir}/../development/studio/studio.vmoptions" \
-      KOTLIN_OVERRIDE="1.3.30-compose-20190503" \
+      ANDROID_LINT_NULLNESS_IGNORE_DEPRECATED="true" \
+      KOTLIN_OVERRIDE="1.3.50-compose-20190806" \
+      $GRADLE_PLUGIN_VERSION_OVERRIDE \
       open -a "${appPath}" "${projectDir}"
 }
 
 function runStudio() {
+  updateJvmHeapSize
   if [ "${osName}" == "mac" ]; then
     runStudioMac
   else