Skip to content

Commit

Permalink
Update to Gradle 4.10.2 (#4111)
Browse files Browse the repository at this point in the history
  • Loading branch information
chetanmeh authored and csantanapr committed Nov 29, 2018
1 parent 7f571c3 commit a790bb8
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 4 deletions.
4 changes: 1 addition & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -87,9 +87,7 @@ subprojects {
enabled false
}

configurations.archives.with {
artifacts.remove artifacts.find { it.archiveTask.is distZip }
}
configurations.archives.artifacts.removeAll {it.file =~ 'zip'}
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@

distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.8.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
23 changes: 23 additions & 0 deletions tests/src/main/scala/org/apache/openwhisk/GradleWorkaround.scala
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package org.apache.openwhisk

/**
* This class is a workaround for https://github.com/gradle/gradle/issues/6849
*/
class GradleWorkaround {}

0 comments on commit a790bb8

Please sign in to comment.