-
Notifications
You must be signed in to change notification settings - Fork 9
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Showing
26 changed files
with
969 additions
and
111 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
def debrickedOutputFile = new File('.debricked.multiprojects.txt') | ||
|
||
allprojects { | ||
task debrickedFindSubProjectPaths() { | ||
String output = project.projectDir | ||
doLast { | ||
synchronized(debrickedOutputFile) { | ||
debrickedOutputFile << output + System.getProperty("line.separator") | ||
} | ||
} | ||
} | ||
} | ||
|
||
allprojects { | ||
task debrickedAllDeps(type: DependencyReportTask) { | ||
outputFile = file('./.debricked-gradle-dependencies.txt') | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
package finder | ||
package gradle | ||
|
||
type SetupScriptError struct { | ||
message string | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
pkg/io/finder/init_script_handler.go → pkg/io/finder/gradle/init_script_handler.go
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
package finder | ||
package gradle | ||
|
||
import ( | ||
"github.com/debricked/cli/pkg/io/writer" | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,28 @@ | ||
package gradle | ||
|
||
// func TestWriteInitFile(t *testing.T) { | ||
// createErr := errors.New("create-error") | ||
// fileWriterMock := &writerTestdata.FileWriterMock{CreateErr: createErr} | ||
|
||
// sf := InitScriptHandler{fileWriter: fileWriterMock} | ||
// err := sf.WriteInitFile() | ||
// assert.Equal(t, SetupScriptError{createErr.Error()}, err) | ||
|
||
// fileWriterMock = &writerTestdata.FileWriterMock{WriteErr: createErr} | ||
// sf = InitScriptHandler{initPath: "file", fileWriter: fileWriterMock} | ||
// err = sf.WriteInitFile() | ||
// assert.Equal(t, SetupScriptError{createErr.Error()}, err) | ||
// } | ||
|
||
// func TestWriteInitFileNoInitFile(t *testing.T) { | ||
// sf := InitScriptHandler{initPath: "file", fileWriter: nil} | ||
// oldGradleInitScript := gradleInitScript | ||
// defer func() { | ||
// gradleInitScript = oldGradleInitScript | ||
// }() | ||
// gradleInitScript = embed.FS{} | ||
// err := sf.WriteInitFile() | ||
// readErr := errors.New("open gradle-init/gradle-init-script.groovy: file does not exist") | ||
// assert.Equal(t, SetupScriptError{readErr.Error()}, err) | ||
|
||
// } |
2 changes: 1 addition & 1 deletion
2
pkg/io/finder/meta_file_finder.go → pkg/io/finder/gradle/meta_file_finder.go
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
package finder | ||
package gradle | ||
|
||
import ( | ||
"os" | ||
|
2 changes: 1 addition & 1 deletion
2
pkg/io/finder/meta_file_finder_test.go → ...io/finder/gradle/meta_file_finder_test.go
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
package finder | ||
package gradle | ||
|
||
import ( | ||
"errors" | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
package testdata | ||
|
||
import ( | ||
"os/exec" | ||
"strings" | ||
) | ||
|
||
type CmdFactoryMock struct { | ||
Err error | ||
Name string | ||
} | ||
|
||
func (f CmdFactoryMock) MakeDependenciesGraphCmd(dir string, gradlew string, _ string) (*exec.Cmd, error) { | ||
err := f.Err | ||
if gradlew == "gradle" { | ||
err = nil | ||
} | ||
|
||
if f.Err != nil && strings.HasPrefix(f.Err.Error(), "give-error-on-gradle") { | ||
err = f.Err | ||
} | ||
|
||
return exec.Command(f.Name, `MakeDependenciesCmd`), err | ||
} | ||
|
||
// implement the interface | ||
func (f CmdFactoryMock) MakeFindSubGraphCmd(_ string, _ string, _ string) (*exec.Cmd, error) { | ||
return exec.Command(f.Name, `MakeFindSubGraphCmd`), f.Err | ||
} | ||
|
||
// implement the interface | ||
func (f CmdFactoryMock) MakeDependenciesCmd(_ string) (*exec.Cmd, error) { | ||
return exec.Command(f.Name, `MakeDependenciesCmd`), f.Err | ||
} |
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
package finder | ||
package maven | ||
|
||
import ( | ||
"path/filepath" | ||
|
2 changes: 1 addition & 1 deletion
2
pkg/io/finder/maven_test.go → pkg/io/finder/maven/maven_test.go
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
package finder | ||
package maven | ||
|
||
import ( | ||
"path/filepath" | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
package testdata | ||
|
||
import "os/exec" | ||
|
||
type CmdFactoryMock struct { | ||
Err error | ||
Name string | ||
Arg string | ||
} | ||
|
||
func (f CmdFactoryMock) MakeDependencyTreeCmd(_ string) (*exec.Cmd, error) { | ||
if len(f.Arg) == 0 { | ||
f.Arg = `"MakeDependencyTreeCmd"` | ||
} | ||
return exec.Command(f.Name, f.Arg), f.Err | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,253 @@ | ||
<?xml version="1.0" encoding="UTF-8"?> | ||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> | ||
<modelVersion>4.0.0</modelVersion> | ||
<parent> | ||
<groupId>com.google.guava</groupId> | ||
<artifactId>guava-parent</artifactId> | ||
<version>HEAD-jre-SNAPSHOT</version> | ||
</parent> | ||
<artifactId>guava</artifactId> | ||
<packaging>bundle</packaging> | ||
<name>Guava: Google Core Libraries for Java</name> | ||
<url>https://github.com/google/guava</url> | ||
<description> | ||
Guava is a suite of core and expanded libraries that include | ||
utility classes, Google's collections, I/O classes, and | ||
much more. | ||
</description> | ||
<dependencies> | ||
<dependency> | ||
<groupId>com.google.guava</groupId> | ||
<artifactId>failureaccess</artifactId> | ||
<version>1.0.1</version> | ||
</dependency> | ||
<dependency> | ||
<groupId>com.google.guava</groupId> | ||
<artifactId>listenablefuture</artifactId> | ||
<version>9999.0-empty-to-avoid-conflict-with-guava</version> | ||
</dependency> | ||
<dependency> | ||
<groupId>com.google.code.findbugs</groupId> | ||
<artifactId>jsr305</artifactId> | ||
</dependency> | ||
<dependency> | ||
<groupId>org.checkerframework</groupId> | ||
<artifactId>checker-qual</artifactId> | ||
</dependency> | ||
<dependency> | ||
<groupId>com.google.errorprone</groupId> | ||
<artifactId>error_prone_annotations</artifactId> | ||
</dependency> | ||
<dependency> | ||
<groupId>com.google.j2objc</groupId> | ||
<artifactId>j2objc-annotations</artifactId> | ||
</dependency> | ||
<!-- TODO(cpovirk): does this comment belong on the <dependency> in <profiles>? --> | ||
<!-- TODO(cpovirk): want this only for dependency plugin but seems not to work there? Maven runs without failure, but the resulting Javadoc is missing the hoped-for inherited text --> | ||
</dependencies> | ||
<build> | ||
<plugins> | ||
<plugin> | ||
<artifactId>maven-jar-plugin</artifactId> | ||
<configuration> | ||
<archive> | ||
<manifestEntries> | ||
<Automatic-Module-Name>com.google.common</Automatic-Module-Name> | ||
</manifestEntries> | ||
</archive> | ||
</configuration> | ||
</plugin> | ||
<plugin> | ||
<extensions>true</extensions> | ||
<groupId>org.apache.felix</groupId> | ||
<artifactId>maven-bundle-plugin</artifactId> | ||
<version>5.1.8</version> | ||
<executions> | ||
<execution> | ||
<id>bundle-manifest</id> | ||
<phase>process-classes</phase> | ||
<goals> | ||
<goal>manifest</goal> | ||
</goals> | ||
</execution> | ||
</executions> | ||
<configuration> | ||
<instructions> | ||
<Export-Package> | ||
!com.google.common.base.internal, | ||
!com.google.common.util.concurrent.internal, | ||
com.google.common.* | ||
</Export-Package> | ||
<Import-Package> | ||
com.google.common.util.concurrent.internal, | ||
javax.annotation;resolution:=optional, | ||
javax.crypto.*;resolution:=optional, | ||
sun.misc.*;resolution:=optional | ||
</Import-Package> | ||
<Bundle-DocURL>https://github.com/google/guava/</Bundle-DocURL> | ||
</instructions> | ||
</configuration> | ||
</plugin> | ||
<plugin> | ||
<artifactId>maven-compiler-plugin</artifactId> | ||
</plugin> | ||
<plugin> | ||
<artifactId>maven-source-plugin</artifactId> | ||
</plugin> | ||
<!-- TODO(cpovirk): include JDK sources when building testlib doc, too --> | ||
<plugin> | ||
<artifactId>maven-dependency-plugin</artifactId> | ||
<executions> | ||
<execution> | ||
<id>unpack-jdk-sources</id> | ||
<phase>generate-sources</phase> | ||
<goals><goal>unpack-dependencies</goal></goals> | ||
<configuration> | ||
<includeArtifactIds>srczip</includeArtifactIds> | ||
<outputDirectory>${project.build.directory}/jdk-sources</outputDirectory> | ||
<silent>false</silent> | ||
<!-- Exclude module-info files (since we're using -source 8 to avoid other modules problems) and FileDescriptor (which uses a language feature not available in Java 8). --> | ||
<excludes>**/module-info.java,**/java/io/FileDescriptor.java</excludes> | ||
</configuration> | ||
</execution> | ||
</executions> | ||
</plugin> | ||
<plugin> | ||
<groupId>org.codehaus.mojo</groupId> | ||
<artifactId>animal-sniffer-maven-plugin</artifactId> | ||
</plugin> | ||
<plugin> | ||
<artifactId>maven-javadoc-plugin</artifactId> | ||
<configuration> | ||
<!-- TODO(cpovirk): Move this to the parent after making jdk-sources available there. --> | ||
<!-- TODO(cpovirk): can we use includeDependencySources and a local com.oracle.java:jdk-lib:noversion:sources instead of all this unzipping and manual sourcepath modification? --> | ||
<!-- (We need JDK *sources*, not just -link, so that {@inheritDoc} works.) --> | ||
<sourcepath>${project.build.sourceDirectory}:${project.build.directory}/jdk-sources</sourcepath> | ||
|
||
<!-- Passing `-subpackages com.google.common` breaks things, so we explicitly exclude everything else instead. --> | ||
<!-- excludePackageNames requires specification of packages separately from "all subpackages". | ||
https://issues.apache.org/jira/browse/MJAVADOC-584 --> | ||
<excludePackageNames> | ||
com.azul.tooling.in,com.google.common.base.internal,com.google.common.base.internal.*,com.google.thirdparty.publicsuffix,com.google.thirdparty.publicsuffix.*,com.oracle.*,com.sun.*,java.*,javax.*,jdk,jdk.*,org.*,sun.* | ||
</excludePackageNames> | ||
<!-- Ignore some tags that are found in Java 11 sources but not recognized... under -source 8, I think it was? I can no longer reproduce the failure. --> | ||
<tags> | ||
<tag> | ||
<name>apiNote</name> | ||
<placement>X</placement> | ||
</tag> | ||
<tag> | ||
<name>implNote</name> | ||
<placement>X</placement> | ||
</tag> | ||
<tag> | ||
<name>implSpec</name> | ||
<placement>X</placement> | ||
</tag> | ||
<tag> | ||
<name>jls</name> | ||
<placement>X</placement> | ||
</tag> | ||
<tag> | ||
<name>revised</name> | ||
<placement>X</placement> | ||
</tag> | ||
<tag> | ||
<name>spec</name> | ||
<placement>X</placement> | ||
</tag> | ||
</tags> | ||
|
||
<!-- TODO(cpovirk): Move this to the parent after making the package-list files available there. --> | ||
<!-- We add the link ourselves, both so that we can choose Java 9 over the version that -source suggests and so that we can solve the JSR305 problem described below. --> | ||
<detectJavaApiLink>false</detectJavaApiLink> | ||
<offlineLinks> | ||
<!-- We need local copies of some of these for 2 reasons: a User-Agent problem (https://stackoverflow.com/a/47891403/28465) and an SSL problem (https://issues.apache.org/jira/browse/MJAVADOC-507). If we choose to work around the User-Agent problem, we can go back to <links>, sidestepping the SSL problem. --> | ||
<!-- Even after we stop using JSR305 annotations in our own code, we'll want this link so that NullPointerTester's docs can link to @CheckForNull and friends... at least once we start using this config for guava-testlib. --> | ||
<offlineLink> | ||
<url>https://static.javadoc.io/com.google.code.findbugs/jsr305/3.0.1/</url> | ||
<location>${project.basedir}/javadoc-link/jsr305</location> | ||
</offlineLink> | ||
<offlineLink> | ||
<url>https://static.javadoc.io/com.google.j2objc/j2objc-annotations/1.1/</url> | ||
<location>${project.basedir}/javadoc-link/j2objc-annotations</location> | ||
</offlineLink> | ||
<!-- The JDK doc must be listed after JSR305 (and as an <offlineLink>, not a <link>) so that JSR305 "claims" javax.annotation. --> | ||
<offlineLink> | ||
<url>https://docs.oracle.com/javase/9/docs/api/</url> | ||
<location>https://docs.oracle.com/javase/9/docs/api/</location> | ||
</offlineLink> | ||
<!-- The Checker Framework likewise would claim javax.annotations, despite providing only a subset of the JSR305 annotations, so it must likewise come after JSR305. --> | ||
<offlineLink> | ||
<url>https://checkerframework.org/api/</url> | ||
<location>${project.basedir}/javadoc-link/checker-framework</location> | ||
</offlineLink> | ||
</offlineLinks> | ||
<links> | ||
<link>https://errorprone.info/api/latest/</link> | ||
</links> | ||
</configuration> | ||
<executions> | ||
<execution> | ||
<id>attach-docs</id> | ||
</execution> | ||
<execution> | ||
<id>generate-javadoc-site-report</id> | ||
<phase>site</phase> | ||
<goals><goal>javadoc</goal></goals> | ||
</execution> | ||
</executions> | ||
</plugin> | ||
</plugins> | ||
</build> | ||
<profiles> | ||
<profile> | ||
<id>srczip-parent</id> | ||
<activation> | ||
<file> | ||
<exists>${java.home}/../src.zip</exists> | ||
</file> | ||
</activation> | ||
<dependencies> | ||
<dependency> | ||
<groupId>jdk</groupId> | ||
<artifactId>srczip</artifactId> | ||
<version>999</version> | ||
<scope>system</scope> | ||
<systemPath>${java.home}/../src.zip</systemPath> | ||
<optional>true</optional> | ||
</dependency> | ||
</dependencies> | ||
</profile> | ||
<profile> | ||
<id>srczip-lib</id> | ||
<activation> | ||
<file> | ||
<exists>${java.home}/lib/src.zip</exists> | ||
</file> | ||
</activation> | ||
<dependencies> | ||
<dependency> | ||
<groupId>jdk</groupId> | ||
<artifactId>srczip</artifactId> | ||
<version>999</version> | ||
<scope>system</scope> | ||
<systemPath>${java.home}/lib/src.zip</systemPath> | ||
<optional>true</optional> | ||
</dependency> | ||
</dependencies> | ||
<build> | ||
<plugins> | ||
<plugin> | ||
<artifactId>maven-javadoc-plugin</artifactId> | ||
<configuration> | ||
<!-- We need to point at the java.base subdirectory because Maven appears to assume that package foo.bar is located in foo/bar and not java.base/foo/bar when translating excludePackageNames into filenames to pass to javadoc. (Note that manually passing -exclude to javadoc appears to possibly not work at all for java.* types??) Also, referring only to java.base avoids a lot of other sources. --> | ||
<sourcepath>${project.build.sourceDirectory}:${project.build.directory}/jdk-sources/java.base</sourcepath> | ||
</configuration> | ||
</plugin> | ||
</plugins> | ||
</build> | ||
</profile> | ||
</profiles> | ||
</project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
pandas==1.1.1 | ||
# comment | ||
numpy==1.2.3 |
Large diffs are not rendered by default.
Oops, something went wrong.