Skip to content

Commit 5ee5f3f

Browse files
anmonteirodnolen
authored andcommitted
CLJS-2316: Upgrade Closure Compiler to August release
1 parent 9243370 commit 5ee5f3f

File tree

5 files changed

+13
-22
lines changed

5 files changed

+13
-22
lines changed

pom.template.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<dependency>
3131
<groupId>com.google.javascript</groupId>
3232
<artifactId>closure-compiler-unshaded</artifactId>
33-
<version>v20170626</version>
33+
<version>v20170806</version>
3434
</dependency>
3535
<dependency>
3636
<groupId>org.clojure</groupId>

project.clj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
[org.clojure/test.check "0.10.0-alpha2" :scope "test"]
1515
[com.cognitect/transit-clj "0.8.300"]
1616
[org.clojure/google-closure-library "0.0-20170809-b9c14c6b"]
17-
[com.google.javascript/closure-compiler-unshaded "v20170626"]
17+
[com.google.javascript/closure-compiler-unshaded "v20170806"]
1818
[org.mozilla/rhino "1.7R5"]]
1919
:profiles {:1.6 {:dependencies [[org.clojure/clojure "1.6.0"]]}
2020
:uberjar {:aot :all :main clojure.main}}

script/bootstrap

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ set -e
55
CLOJURE_RELEASE="1.9.0-alpha17"
66
SPEC_ALPHA_RELEASE="0.1.123"
77
CORE_SPECS_ALPHA_RELEASE="0.1.10"
8-
CLOSURE_RELEASE="20170626"
8+
CLOSURE_RELEASE="20170806"
99
DJSON_RELEASE="0.2.6"
1010
TRANSIT_RELEASE="0.8.300"
1111
GCLOSURE_LIB_RELEASE="0.0-20170809-b9c14c6b"
@@ -55,7 +55,7 @@ echo "Fetching transit-clj..."
5555
curl --retry 3 -O -s https://repo1.maven.org/maven2/com/cognitect/transit-clj/$TRANSIT_RELEASE/transit-clj-$TRANSIT_RELEASE.jar || { echo "Download failed."; exit 1; }
5656
echo "Copying transit-clj-$TRANSIT_RELEASE.jar to lib/transit-clj-$TRANSIT_RELEASE.jar..."
5757
cp transit-clj-$TRANSIT_RELEASE.jar lib/transit-clj-$TRANSIT_RELEASE.jar
58-
echo "Cleaning up data.json..."
58+
echo "Cleaning up transit-clj..."
5959
rm transit-clj-$TRANSIT_RELEASE.jar
6060

6161
echo "Fetching Google Closure library..."
@@ -86,16 +86,13 @@ else
8686
cp google-closure-library-third-party-$GCLOSURE_LIB_RELEASE.jar ../../lib/google-closure-library-third-party-$GCLOSURE_LIB_RELEASE.jar
8787
rm google-closure-library-third-party-$GCLOSURE_LIB_RELEASE.jar
8888
fi
89-
cd ..
89+
cd ../..
9090

9191
echo "Fetching Google Closure compiler..."
92-
mkdir -p compiler
93-
cd compiler
94-
curl --retry 3 -O -s https://dl.google.com/closure-compiler/compiler-$CLOSURE_RELEASE.zip || { echo "Download failed."; exit 1; }
95-
unzip -qu compiler-$CLOSURE_RELEASE.zip
96-
echo "Cleaning up Google Closure compiler archive..."
97-
rm compiler-$CLOSURE_RELEASE.zip
98-
cd ../..
92+
curl --retry 3 -O -s http://repo1.maven.org/maven2/com/google/javascript/closure-compiler/v$CLOSURE_RELEASE/closure-compiler-v$CLOSURE_RELEASE.jar || { echo "Download failed."; exit 1; }
93+
cp closure-compiler-v$CLOSURE_RELEASE.jar lib/closure-compiler-v$CLOSURE_RELEASE.jar
94+
echo "Cleaning up closure-compiler.jar..."
95+
rm closure-compiler-v$CLOSURE_RELEASE.jar
9996

10097
if [ "$1" = "--closure-library-head" ] ; then
10198
echo "Building lib/goog.jar..."
@@ -113,9 +110,6 @@ rm -rf rhino$RHINO_RELEASE/
113110
echo "Cleaning up Rhino archive..."
114111
rm rhino$RHINO_RELEASE.zip
115112

116-
echo "Copying closure/compiler/compiler.jar to lib/compiler.jar"
117-
cp closure/compiler/closure-compiler-v$CLOSURE_RELEASE.jar lib
118-
119113
echo "Fetching tools.reader $TREADER_RELEASE ..."
120114
curl --retry 3 -O -s https://repo1.maven.org/maven2/org/clojure/tools.reader/$TREADER_RELEASE/tools.reader-$TREADER_RELEASE.jar || { echo "Download failed."; exit 1; }
121115

script/bootstrap.ps1

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -128,12 +128,10 @@ Get-WebResource `
128128

129129
Write-Host "Fetching Google Closure compiler..."
130130
Get-WebResource `
131-
https://dl.google.com/closure-compiler/compiler-$CLOSURE_RELEASE.zip `
132-
$root\compiler-$CLOSURE_RELEASE.zip
133-
Get-ChildItem $root\closure\compiler\* | Delete-File
134-
Expand-ZipFile $root\compiler-$CLOSURE_RELEASE.zip $root\closure\compiler
135-
Copy-File $root\closure\compiler\closure-compiler-v$CLOSURE_RELEASE.jar $root\lib\compiler.jar
136-
Delete-File $root\compiler-$CLOSURE_RELEASE.zip
131+
http://repo1.maven.org/maven2/com/google/javascript/closure-compiler/v$CLOSURE_RELEASE/closure-compiler-v$CLOSURE_RELEASE.jar `
132+
$root\closure-compiler-v$CLOSURE_RELEASE.jar
133+
Copy-File $root\closure-compiler-v$CLOSURE_RELEASE.jar $root\lib\compiler.jar
134+
Delete-File $root\closure-compiler-v$CLOSURE_RELEASE.jar
137135

138136
Write-Host "Fetching Rhino..."
139137
Get-WebResource `

src/main/clojure/cljs/closure.clj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,6 @@
123123
:fileoverview-jsdoc DiagnosticGroups/FILEOVERVIEW_JSDOC
124124
:function-params DiagnosticGroups/FUNCTION_PARAMS
125125
:global-this DiagnosticGroups/GLOBAL_THIS
126-
:inferred-const-checks DiagnosticGroups/INFERRED_CONST_CHECKS
127126
:internet-explorer-checks DiagnosticGroups/INTERNET_EXPLORER_CHECKS
128127
:invalid-casts DiagnosticGroups/INVALID_CASTS
129128
:j2cl-checks DiagnosticGroups/J2CL_CHECKS

0 commit comments

Comments
 (0)