Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implement new abstract method in SystemReader #310

Merged
merged 3 commits into from
Dec 23, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions grgit-core/gradle/dependency-locks/compileClasspath.lockfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
com.googlecode.javaewah:JavaEWAH:1.1.6
com.jcraft:jsch:0.1.55
com.jcraft:jzlib:1.1.1
org.bouncycastle:bcpg-jdk15on:1.61
org.bouncycastle:bcpkix-jdk15on:1.61
org.bouncycastle:bcprov-jdk15on:1.61
org.bouncycastle:bcpg-jdk15on:1.64
org.bouncycastle:bcpkix-jdk15on:1.64
org.bouncycastle:bcprov-jdk15on:1.64
org.codehaus.groovy:groovy:2.5.8
org.eclipse.jgit:org.eclipse.jgit:5.5.1.201910021850-r
org.eclipse.jgit:org.eclipse.jgit:5.6.0.201912101111-r
org.slf4j:slf4j-api:1.7.2
8 changes: 4 additions & 4 deletions grgit-core/gradle/dependency-locks/runtimeClasspath.lockfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
com.googlecode.javaewah:JavaEWAH:1.1.6
com.jcraft:jsch:0.1.55
com.jcraft:jzlib:1.1.1
org.bouncycastle:bcpg-jdk15on:1.61
org.bouncycastle:bcpkix-jdk15on:1.61
org.bouncycastle:bcprov-jdk15on:1.61
org.eclipse.jgit:org.eclipse.jgit:5.5.1.201910021850-r
org.bouncycastle:bcpg-jdk15on:1.64
org.bouncycastle:bcpkix-jdk15on:1.64
org.bouncycastle:bcprov-jdk15on:1.64
org.eclipse.jgit:org.eclipse.jgit:5.6.0.201912101111-r
org.slf4j:slf4j-api:1.7.2
10 changes: 5 additions & 5 deletions grgit-core/gradle/dependency-locks/testCompileClasspath.lockfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
com.googlecode.javaewah:JavaEWAH:1.1.6
com.jcraft:jsch:0.1.55
com.jcraft:jzlib:1.1.1
junit:junit:4.13-rc-1
org.bouncycastle:bcpg-jdk15on:1.61
org.bouncycastle:bcpkix-jdk15on:1.61
org.bouncycastle:bcprov-jdk15on:1.61
junit:junit:4.13-rc-2
org.bouncycastle:bcpg-jdk15on:1.64
org.bouncycastle:bcpkix-jdk15on:1.64
org.bouncycastle:bcprov-jdk15on:1.64
org.codehaus.groovy:groovy-json:2.5.4
org.codehaus.groovy:groovy-macro:2.5.4
org.codehaus.groovy:groovy-nio:2.5.4
Expand All @@ -16,7 +16,7 @@ org.codehaus.groovy:groovy-templates:2.5.4
org.codehaus.groovy:groovy-test:2.5.4
org.codehaus.groovy:groovy-xml:2.5.4
org.codehaus.groovy:groovy:2.5.4
org.eclipse.jgit:org.eclipse.jgit:5.5.1.201910021850-r
org.eclipse.jgit:org.eclipse.jgit:5.6.0.201912101111-r
org.hamcrest:hamcrest-core:1.3
org.slf4j:slf4j-api:2.0.0-alpha1
org.spockframework:spock-core:1.3-groovy-2.5
10 changes: 5 additions & 5 deletions grgit-core/gradle/dependency-locks/testRuntimeClasspath.lockfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
com.googlecode.javaewah:JavaEWAH:1.1.6
com.jcraft:jsch:0.1.55
com.jcraft:jzlib:1.1.1
junit:junit:4.13-rc-1
org.bouncycastle:bcpg-jdk15on:1.61
org.bouncycastle:bcpkix-jdk15on:1.61
org.bouncycastle:bcprov-jdk15on:1.61
junit:junit:4.13-rc-2
org.bouncycastle:bcpg-jdk15on:1.64
org.bouncycastle:bcpkix-jdk15on:1.64
org.bouncycastle:bcprov-jdk15on:1.64
org.codehaus.groovy:groovy-json:2.5.4
org.codehaus.groovy:groovy-macro:2.5.4
org.codehaus.groovy:groovy-nio:2.5.4
Expand All @@ -16,7 +16,7 @@ org.codehaus.groovy:groovy-templates:2.5.4
org.codehaus.groovy:groovy-test:2.5.4
org.codehaus.groovy:groovy-xml:2.5.4
org.codehaus.groovy:groovy:2.5.4
org.eclipse.jgit:org.eclipse.jgit:5.5.1.201910021850-r
org.eclipse.jgit:org.eclipse.jgit:5.6.0.201912101111-r
org.hamcrest:hamcrest-core:1.3
org.slf4j:slf4j-api:2.0.0-alpha1
org.slf4j:slf4j-simple:2.0.0-alpha1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,11 @@ public String getProperty(String key) {
return delegate.getProperty(key);
}

@Override
public FileBasedConfig openJGitConfig(Config parent, FS fs) {
return delegate.openJGitConfig(parent, fs);
}

@Override
public FileBasedConfig openUserConfig(Config parent, FS fs) {
return delegate.openUserConfig(parent, fs);
Expand Down
3 changes: 2 additions & 1 deletion grgit-gradle/.stutter/java11.lock
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# DO NOT MODIFY: Generated by Stutter plugin.
5.0
5.6.4
6.0
6.0.1
6.1-rc-1
3 changes: 2 additions & 1 deletion grgit-gradle/.stutter/java13.lock
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
# DO NOT MODIFY: Generated by Stutter plugin.
6.0
6.0.1
6.1-rc-1
3 changes: 2 additions & 1 deletion grgit-gradle/.stutter/java8.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@
4.10.3
5.0
5.6.4
6.0
6.0.1
6.1-rc-1
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
com.googlecode.javaewah:JavaEWAH:1.1.6
com.jcraft:jsch:0.1.55
com.jcraft:jzlib:1.1.1
junit:junit:4.13-rc-1
org.bouncycastle:bcpg-jdk15on:1.61
org.bouncycastle:bcpkix-jdk15on:1.61
org.bouncycastle:bcprov-jdk15on:1.61
org.eclipse.jgit:org.eclipse.jgit:5.5.1.201910021850-r
junit:junit:4.13-rc-2
org.bouncycastle:bcpg-jdk15on:1.64
org.bouncycastle:bcpkix-jdk15on:1.64
org.bouncycastle:bcprov-jdk15on:1.64
org.eclipse.jgit:org.eclipse.jgit:5.6.0.201912101111-r
org.hamcrest:hamcrest-core:1.3
org.slf4j:slf4j-api:1.7.2
org.spockframework:spock-core:1.3-groovy-2.5
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
com.googlecode.javaewah:JavaEWAH:1.1.6
com.jcraft:jsch:0.1.55
com.jcraft:jzlib:1.1.1
junit:junit:4.13-rc-1
org.bouncycastle:bcpg-jdk15on:1.61
org.bouncycastle:bcpkix-jdk15on:1.61
org.bouncycastle:bcprov-jdk15on:1.61
org.eclipse.jgit:org.eclipse.jgit:5.5.1.201910021850-r
junit:junit:4.13-rc-2
org.bouncycastle:bcpg-jdk15on:1.64
org.bouncycastle:bcpkix-jdk15on:1.64
org.bouncycastle:bcprov-jdk15on:1.64
org.eclipse.jgit:org.eclipse.jgit:5.6.0.201912101111-r
org.hamcrest:hamcrest-core:1.3
org.slf4j:slf4j-api:1.7.2
org.spockframework:spock-core:1.3-groovy-2.5
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
com.googlecode.javaewah:JavaEWAH:1.1.6
com.jcraft:jsch:0.1.55
com.jcraft:jzlib:1.1.1
org.bouncycastle:bcpg-jdk15on:1.61
org.bouncycastle:bcpkix-jdk15on:1.61
org.bouncycastle:bcprov-jdk15on:1.61
org.eclipse.jgit:org.eclipse.jgit:5.5.1.201910021850-r
org.bouncycastle:bcpg-jdk15on:1.64
org.bouncycastle:bcpkix-jdk15on:1.64
org.bouncycastle:bcprov-jdk15on:1.64
org.eclipse.jgit:org.eclipse.jgit:5.6.0.201912101111-r
org.slf4j:slf4j-api:1.7.2
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
com.googlecode.javaewah:JavaEWAH:1.1.6
com.jcraft:jsch:0.1.55
com.jcraft:jzlib:1.1.1
org.bouncycastle:bcpg-jdk15on:1.61
org.bouncycastle:bcpkix-jdk15on:1.61
org.bouncycastle:bcprov-jdk15on:1.61
org.eclipse.jgit:org.eclipse.jgit:5.5.1.201910021850-r
org.bouncycastle:bcpg-jdk15on:1.64
org.bouncycastle:bcpkix-jdk15on:1.64
org.bouncycastle:bcprov-jdk15on:1.64
org.eclipse.jgit:org.eclipse.jgit:5.6.0.201912101111-r
org.slf4j:slf4j-api:1.7.2
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
com.googlecode.javaewah:JavaEWAH:1.1.6
com.jcraft:jsch:0.1.55
com.jcraft:jzlib:1.1.1
org.bouncycastle:bcpg-jdk15on:1.61
org.bouncycastle:bcpkix-jdk15on:1.61
org.bouncycastle:bcprov-jdk15on:1.61
org.eclipse.jgit:org.eclipse.jgit:5.5.1.201910021850-r
org.bouncycastle:bcpg-jdk15on:1.64
org.bouncycastle:bcpkix-jdk15on:1.64
org.bouncycastle:bcprov-jdk15on:1.64
org.eclipse.jgit:org.eclipse.jgit:5.6.0.201912101111-r
org.slf4j:slf4j-api:1.7.2
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
com.googlecode.javaewah:JavaEWAH:1.1.6
com.jcraft:jsch:0.1.55
com.jcraft:jzlib:1.1.1
org.bouncycastle:bcpg-jdk15on:1.61
org.bouncycastle:bcpkix-jdk15on:1.61
org.bouncycastle:bcprov-jdk15on:1.61
org.eclipse.jgit:org.eclipse.jgit:5.5.1.201910021850-r
org.bouncycastle:bcpg-jdk15on:1.64
org.bouncycastle:bcpkix-jdk15on:1.64
org.bouncycastle:bcprov-jdk15on:1.64
org.eclipse.jgit:org.eclipse.jgit:5.6.0.201912101111-r
org.slf4j:slf4j-api:1.7.2