CompositeConfig does not exist anymore. Since be18edb the CompositeConfig class does not exist anymore as the standard JGit Config provides the ability to recursively get the list of section names from gerrit.config and secure.config Change-Id: Ibda67a5423a2922faacadc62794acd14359b0e6e
diff --git a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/GitHubConfig.java b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/GitHubConfig.java index 60e5dd7..ff00469 100644 --- a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/GitHubConfig.java +++ b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/GitHubConfig.java
@@ -17,13 +17,15 @@ import java.net.MalformedURLException; import java.util.HashMap; +import org.eclipse.jgit.lib.Config; + import com.google.common.base.Objects; import com.google.common.collect.Maps; import com.google.gerrit.server.config.AllProjectsNameProvider; +import com.google.gerrit.server.config.GerritServerConfig; import com.google.gerrit.server.config.SitePaths; import com.google.inject.Inject; import com.google.inject.Singleton; -import com.googlesource.gerrit.plugins.github.oauth.CompositeConfig; import com.googlesource.gerrit.plugins.github.oauth.GitHubOAuthConfig; @Singleton @@ -66,7 +68,7 @@ @Inject - public GitHubConfig(CompositeConfig config, final SitePaths site, AllProjectsNameProvider allProjectsNameProvider) + public GitHubConfig(@GerritServerConfig Config config, final SitePaths site, AllProjectsNameProvider allProjectsNameProvider) throws MalformedURLException { super(config); String[] wizardFlows =