Skip to content

Commit

Permalink
Update versions
Browse files Browse the repository at this point in the history
  • Loading branch information
@JolandaVerhoef
JolandaVerhoef committed Aug 11, 2022
1 parent 12764b6 commit db9e436
Show file tree
Hide file tree
Showing 9 changed files with 69 additions and 48 deletions.
8 changes: 4 additions & 4 deletions Crane/buildSrc/src/main/java/com/example/crane/buildsrc/Dependencies.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ object Versions {
}

object Libs {
const val androidGradlePlugin = "com.android.tools.build:gradle:7.2.1"
const val androidGradlePlugin = "com.android.tools.build:gradle:7.2.2"
const val secretsGradlePlugin = "com.google.android.libraries.mapsplatform.secrets-gradle-plugin:secrets-gradle-plugin:2.0.1"
const val ktLint = "com.pinterest:ktlint:${Versions.ktlint}"

Expand All @@ -43,7 +43,7 @@ object Libs {
const val extensions = "org.jetbrains.kotlin:kotlin-android-extensions:$version"

object Coroutines {
private const val version = "1.6.0"
private const val version = "1.7.10"
const val android = "org.jetbrains.kotlinx:kotlinx-coroutines-android:$version"
const val test = "org.jetbrains.kotlinx:kotlinx-coroutines-test:$version"
}
Expand All @@ -57,9 +57,9 @@ object Libs {
const val appcompat = "androidx.appcompat:appcompat:1.4.1"

object Compose {
const val compilerVersion = "1.3.0-rc02"
const val compilerVersion = "1.3.0"
const val snapshot = ""
const val version = "1.3.0-alpha02"
const val version = "1.3.0-alpha03"

const val runtime = "androidx.compose.runtime:runtime:$version"
const val runtimeLivedata = "androidx.compose.runtime:runtime-livedata:$version"
Expand Down
6 changes: 3 additions & 3 deletions JetNews/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@

buildscript {
ext.kotlin_version = '1.7.10'
ext.compose_compiler_version = '1.3.0-rc02'
ext.compose_version = '1.3.0-alpha02'
ext.compose_compiler_version = '1.3.0'
ext.compose_version = '1.3.0-alpha03'
ext.compose_snapshot_version = ''
ext.coroutines_version = '1.6.0'
ext.accompanist_version = '0.26.0-alpha'
ext.accompanist_version = '0.26.1-alpha'

repositories {
google()
Expand Down
8 changes: 4 additions & 4 deletions Jetcaster/buildSrc/src/main/java/com/example/jetcaster/buildsrc/dependencies.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ object Versions {
}

object Libs {
const val androidGradlePlugin = "com.android.tools.build:gradle:7.2.1"
const val androidGradlePlugin = "com.android.tools.build:gradle:7.2.2"
const val jdkDesugar = "com.android.tools:desugar_jdk_libs:1.1.5"

object Accompanist {
const val version = "0.26.0-alpha"
const val version = "0.26.1-alpha"
const val pager = "com.google.accompanist:accompanist-pager:$version"
}

Expand Down Expand Up @@ -69,9 +69,9 @@ object Libs {
}

object Compose {
const val compilerVersion = "1.3.0-rc02"
const val compilerVersion = "1.3.0"
const val snapshot = ""
const val version = "1.3.0-alpha02"
const val version = "1.3.0-alpha03"

@get:JvmStatic
val snapshotUrl: String
Expand Down
6 changes: 3 additions & 3 deletions Jetchat/buildSrc/src/main/java/com/example/compose/jetchat/buildsrc/dependencies.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ object Versions {
}

object Libs {
const val androidGradlePlugin = "com.android.tools.build:gradle:7.2.1"
const val androidGradlePlugin = "com.android.tools.build:gradle:7.2.2"
const val jdkDesugar = "com.android.tools:desugar_jdk_libs:1.1.5"

const val junit = "junit:junit:4.13"
Expand Down Expand Up @@ -51,9 +51,9 @@ object Libs {
}

object Compose {
const val compilerVersion = "1.3.0-rc02"
const val compilerVersion = "1.3.0"
const val snapshot = ""
const val version = "1.3.0-alpha02"
const val version = "1.3.0-alpha03"

const val foundation = "androidx.compose.foundation:foundation:$version"
const val layout = "androidx.compose.foundation:foundation-layout:$version"
Expand Down
8 changes: 4 additions & 4 deletions Jetsnack/buildSrc/src/main/java/com/example/jetsnack/buildsrc/Dependencies.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ object Versions {
}

object Libs {
const val androidGradlePlugin = "com.android.tools.build:gradle:7.2.1"
const val androidGradlePlugin = "com.android.tools.build:gradle:7.2.2"

object Accompanist {
const val version = "0.26.0-alpha"
const val version = "0.26.1-alpha"
const val systemuicontroller = "com.google.accompanist:accompanist-systemuicontroller:$version"
const val flowlayouts = "com.google.accompanist:accompanist-flowlayout:$version"
}
Expand All @@ -47,9 +47,9 @@ object Libs {
const val coreKtx = "androidx.core:core-ktx:1.7.0"

object Compose {
const val compilerVersion = "1.3.0-rc02"
const val compilerVersion = "1.3.0"
const val snapshot = ""
const val version = "1.3.0-alpha02"
const val version = "1.3.0-alpha03"

const val foundation = "androidx.compose.foundation:foundation:${version}"
const val layout = "androidx.compose.foundation:foundation-layout:${version}"
Expand Down
8 changes: 4 additions & 4 deletions Jetsurvey/buildSrc/src/main/java/com/example/compose/jetsurvey/buildsrc/dependencies.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@ object Versions {
}

object Libs {
const val androidGradlePlugin = "com.android.tools.build:gradle:7.2.1"
const val androidGradlePlugin = "com.android.tools.build:gradle:7.2.2"
const val jdkDesugar = "com.android.tools:desugar_jdk_libs:1.1.5"

const val junit = "junit:junit:4.13.2"

object Accompanist {
const val version = "0.26.0-alpha"
const val version = "0.26.1-alpha"
const val permissions = "com.google.accompanist:accompanist-permissions:$version"
}

Expand Down Expand Up @@ -60,9 +60,9 @@ object Libs {
}

object Compose {
const val compilerVersion = "1.3.0-rc02"
const val compilerVersion = "1.3.0"
const val snapshot = ""
const val version = "1.3.0-alpha02"
const val version = "1.3.0-alpha03"

@get:JvmStatic
val snapshotUrl: String
Expand Down
6 changes: 3 additions & 3 deletions Owl/buildSrc/src/main/java/com/example/owl/buildsrc/Dependencies.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ object Versions {
const val ktlint = "0.45.2"
}
object Libs {
const val androidGradlePlugin = "com.android.tools.build:gradle:7.2.1"
const val androidGradlePlugin = "com.android.tools.build:gradle:7.2.2"
object Kotlin {
private const val version = "1.7.10"
const val stdlib = "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$version"
Expand All @@ -45,9 +45,9 @@ object Libs {
const val activityCompose = "androidx.activity:activity-compose:1.4.0"
}
object Compose {
const val compilerVersion = "1.3.0-rc02"
const val compilerVersion = "1.3.0"
const val snapshot = ""
const val version = "1.3.0-alpha02"
const val version = "1.3.0-alpha03"

const val animation = "androidx.compose.animation:animation:$version"
const val foundation = "androidx.compose.foundation:foundation:$version"
Expand Down
4 changes: 2 additions & 2 deletions Reply/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@

buildscript {
// Extracted for updating via scripts/upgrade_samples.sh
ext.compose_version = '1.3.0-alpha02'
ext.compose_compiler_version = '1.3.0-rc02'
ext.compose_version = '1.3.0-alpha03'
ext.compose_compiler_version = '1.3.0'
ext.kotlin_version = '1.7.10'

ext {
Expand Down
63 changes: 42 additions & 21 deletions scripts/upgrade_samples.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,30 +27,39 @@ set -e

# Check for clean git status
if [[ `git status --porcelain` ]]; then
read -r -p "You have uncommited git changes. Are you sure you want to continue? [y/N] " response
read -r -p "You have uncommited git changes. Are you sure you want to continue? [Y/n] " response
if [[ "$response" =~ ^([nN])$ ]]; then
exit 0;
fi
fi

echo "Find Compose releases at: https://jetpad.corp.google.com/libraryreleases?groupId=androidx.compose.ui&artifactId=ui"
echo "Version to change Compose to (e.g 1.2.0-alpha06): ";
read compose_version;

echo "Version to change Compose Compiler to (e.g 1.2.0): ";
echo "Snapshot ID: (Blank for none)";
read snapshot_version;

echo "Find Compose Compiler releases at: https://jetpad.corp.google.com/groupreleases?groupId=androidx.compose.compiler"
echo "Version to change Compose Compiler to (e.g 1.3.0): ";
read compose_compiler_version;

echo "Version to change Kotlin to (e.g 1.7.10): ";
read kotlin_version;
echo "Compiler snapshot ID: (Blank for none)";
read compiler_snapshot_version;

echo "Snapshot ID: (Blank for none)";
read snapshot_version;
echo "Each Compose Compiler version is linked to a Kotlin version, see: https://developer.android.com/jetpack/androidx/releases/compose-kotlin#pre-release_kotlin_compatibility"
echo "Version to change Kotlin to (e.g. 1.7.10): ";
read kotlin_version;

echo "Find Spotless Gradle releases at: https://github.com/diffplug/spotless/tags"
echo "Version to change Spotless to (e.g 6.4.2): ";
read spotless_version;

echo "Find ktlint releases at: https://github.com/pinterest/ktlint/tags"
echo "Version to change ktlint to (e.g 0.45.2): ";
read ktlint_version;

echo "Find Accompanist releases at: https://google.github.io/accompanist/#compose-versions"
echo "Version to change Accompanist to (e.g 0.24.9-beta): ";
read accompanist_version;

Expand All @@ -63,6 +72,12 @@ else
echo "Changing Compose version to $compose_version Snapshot $snapshot_version"
fi

if [ -z "$compiler_snapshot_version" ]; then
echo "Changing Compose Compiler version to $compose_compiler_version"
else
echo "Changing Compose Compiler version to $compose_compiler_version Snapshot $compiler_snapshot_version"
fi

# Change Dependencies.kt versions
for DEPENDENCIES_FILE in `find . -type f -iname "dependencies.kt"` ; do
COMPOSE_BLOCK=false;
Expand All @@ -77,29 +92,32 @@ for DEPENDENCIES_FILE in `find . -type f -iname "dependencies.kt"` ; do
elif [[ $line == *"val compilerVersion ="* && "$compose_compiler_version" != "" ]] && $COMPOSE_BLOCK = true; then
echo "$line" | sed -En 's/".*"/"'$compose_compiler_version'"/p'
MADE_CHANGE=true;
elif [[ $line == *"val version ="* && "$kotlin_version" != "" ]] && $KOTLIN_BLOCK = true; then
echo "$line" | sed -En 's/".*"/"'$kotlin_version'"/p'
elif [[ $line == *"val compilerSnapshot ="* ]] && $COMPOSE_BLOCK = true; then
echo "$line" | sed -En 's/".*"/"'$compiler_snapshot_version'"/p'
MADE_CHANGE=true;
elif [[ $line == *"val snapshot ="* ]] && $COMPOSE_BLOCK = true; then
echo "$line" | sed -En 's/".*"/"'$snapshot_version'"/p'
MADE_CHANGE=true;
elif [[ $line == *"val version ="* && "$kotlin_version" != "" ]] && $KOTLIN_BLOCK = true; then
echo "$line" | sed -En 's/".*"/"'$kotlin_version'"/p'
MADE_CHANGE=true;
elif [[ $line == *"val version ="* && "$accompanist_version" != "" ]] && $ACCOMPANIST_BLOCK = true; then
echo "$line" | sed -En 's/".*"/"'$accompanist_version'"/p'
MADE_CHANGE=true;
elif [[ $line == *"val ktlint ="* && "$ktlint_version" != "" ]]; then
echo "$line" | sed -En 's/".*"/"'$ktlint_version'"/p'
MADE_CHANGE=true;
elif [[ $line == *"val androidGradlePlugin ="* && "$androidGradlePlugin_version" != "" ]]; then
echo "$line" | sed -En 's/".*"/"com.android.tools.build:gradle:'$androidGradlePlugin_version'"/p'
MADE_CHANGE=true;
echo "$line" | sed -En 's/".*"/"com.android.tools.build:gradle:'$androidGradlePlugin_version'"/p'
MADE_CHANGE=true;
else
if [[ $line == *"object Compose {"* ]]; then
COMPOSE_BLOCK=true;
elif [[ $line == *"object Accompanist {"* ]]; then
ACCOMPANIST_BLOCK=true;
elif [[ $line == *"object Kotlin {"* ]]; then
KOTLIN_BLOCK=true;
elif [[ $line == *"}"* ]] || [[ $line == *"object Coroutines {"* ]]; then
elif [[ $line == *"}"* ]]; then
COMPOSE_BLOCK=false;
ACCOMPANIST_BLOCK=false;
KOTLIN_BLOCK=false;
Expand All @@ -122,25 +140,28 @@ for DEPENDENCIES_FILE in `find . -type f -iname "build.gradle"` ; do
TEMP_FILENAME="${DEPENDENCIES_FILE}_new";
while IFS= read -r line; do
if [[ $line == *"ext.compose_version ="* && "$compose_version" != "" ]]; then
echo "$line" | sed -En "s/\'.*'/\'$compose_version\'/p"
echo "$line" | sed -En "s/'.*'/'$compose_version'/p"
MADE_CHANGE=true;
elif [[ $line == *"ext.compose_snapshot_version ="* ]]; then
echo "$line" | sed -En "s/'.*'/'$snapshot_version'/p"
MADE_CHANGE=true;
elif [[ $line == *"ext.compose_compiler_version ="* && "$compose_compiler_version" != "" ]]; then
echo "$line" | sed -En "s/\'.*'/\'$compose_compiler_version\'/p"
echo "$line" | sed -En "s/'.*'/'$compose_compiler_version'/p"
MADE_CHANGE=true;
elif [[ $line == *"ext.kotlin_version ="* && "$kotlin_version" != "" ]]; then
echo "$line" | sed -En "s/\'.*'/\'$kotlin_version\'/p"
elif [[ $line == *"ext.compose_compiler_snapshot_version ="* ]]; then
echo "$line" | sed -En "s/'.*'/'$compiler_snapshot_version'/p"
MADE_CHANGE=true;
elif [[ $line == *"ext.compose_snapshot_version ="* ]]; then
echo "$line" | sed -En "s/\'.*'/\'$snapshot_version\'/p"
elif [[ $line == *"ext.kotlin_version ="* ]]; then
echo "$line" | sed -En "s/'.*'/'$kotlin_version'/p"
MADE_CHANGE=true;
elif [[ $line == *"ext.accompanist_version ="* && "$accompanist_version" != "" ]]; then
echo "$line" | sed -En "s/\'.*'/\'$accompanist_version\'/p"
echo "$line" | sed -En "s/'.*'/'$accompanist_version'/p"
MADE_CHANGE=true;
elif [[ $line == *"ext.androidGradlePlugin_version ="* && "$androidGradlePlugin_version" != "" ]]; then
echo "$line" | sed -En "s/\'.*'/\'com.android.tools.build:gradle:$androidGradlePlugin_version\'/p"
elif [[ $line == *"ext.agp_version ="* && "$androidGradlePlugin_version" != "" ]]; then
echo "$line" | sed -En "s/'.*'/'$androidGradlePlugin_version'/p"
MADE_CHANGE=true;
elif [[ $line == *"'com.diffplug.spotless' version"* && "$spotless_version" != "" ]]; then
echo "$line" | sed -En "s/\'.*'/\'com.diffplug.spotless\' version \'$spotless_version\'/p"
echo "$line" | sed -En "s/'.*'/'com.diffplug.spotless' version '$spotless_version'/p"
MADE_CHANGE=true;
elif [[ $line == *"ktlint(\""* && "$ktlint_version" != "" ]]; then
echo "$line" | sed -En 's/".*"/"'$ktlint_version'"/p'
Expand Down

0 comments on commit db9e436

Please sign in to comment.