Skip to content

Commit

Permalink
Use on all OSes the same .gradle fix as on windows (#1256)
Browse files Browse the repository at this point in the history
  • Loading branch information
alexander-gorshenev authored Oct 14, 2021
1 parent 13620b9 commit 1afb3b1
Showing 1 changed file with 2 additions and 7 deletions.
9 changes: 2 additions & 7 deletions compose/scripts/skikoAospCommit
Original file line number Diff line number Diff line change
Expand Up @@ -46,17 +46,12 @@ $SED -i 's/skiko = ".*"/skiko = "'"$SKIKO_VERSION"'"/' $AOSP_COMPOSE_SOURCE/fram

# we have error on the second call of Gradle:
# Cannot invoke "Build_gradle.getAllFilesWithDependencies()" because "this.this$0.this$0" is null
fixWindows() {
fixGradle() {
rm -rf .gradle
}

downloadSkiko() {
if [[ "$OSTYPE" == "msys" ]]; then
fixWindows
elif [[ "$OSTYPE" == "win32" ]]; then
fixWindows
fi

fixGradle
$JB_GRADLE -PallowJetbrainsDev=true -PartifactName=$1
}

Expand Down

0 comments on commit 1afb3b1

Please sign in to comment.