Skip to content

Commit 07370f4

Browse files
ysb33rysb33r
committed
Restructure packages in core
1 parent ce44d67 commit 07370f4

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+259
-345
lines changed

‎base-plugin/src/integTest/groovy/com/github/jrubygradle/JRubyPrepareGemsIntegrationSpec.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ class JRubyPrepareGemsIntegrationSpec extends IntegrationSpecification {
4141
withDependencies """
4242
gems "rubygems:sinatra:1.4.5"
4343
gems "rubygems:rack:[0,)"
44-
gems "rubygems:lookout-rack-utils:3.1.0.12"
44+
gems "rubygems:lookout-rack-utils:3.8.0.39"
4545
"""
4646

4747
when:

‎base-plugin/src/main/groovy/com/github/jrubygradle/GenerateGradleRb.groovy

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package com.github.jrubygradle
22

3-
import com.github.jrubygradle.core.JRubyAwareTask
4-
import com.github.jrubygradle.internal.JRubyExecUtils
3+
import com.github.jrubygradle.api.core.JRubyAwareTask
54
import groovy.transform.CompileDynamic
65
import groovy.transform.CompileStatic
76
import org.apache.tools.ant.filters.ReplaceTokens

‎base-plugin/src/main/groovy/com/github/jrubygradle/JRubyExec.groovy

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
package com.github.jrubygradle
22

3-
import com.github.jrubygradle.core.JRubyAwareTask
4-
import com.github.jrubygradle.core.JRubyExecSpec
3+
import com.github.jrubygradle.api.core.JRubyAwareTask
4+
import com.github.jrubygradle.api.core.JRubyExecSpec
55
import com.github.jrubygradle.internal.JRubyExecUtils
6-
import org.gradle.api.Task
76
import org.gradle.api.artifacts.Configuration
8-
import org.gradle.api.file.FileCollection
97
import org.gradle.api.provider.Provider
108
import org.gradle.api.tasks.Input
119
import org.gradle.api.tasks.JavaExec

‎base-plugin/src/main/groovy/com/github/jrubygradle/JRubyPlugin.groovy

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,13 @@
11
package com.github.jrubygradle
22

3-
import com.github.jrubygradle.core.JRubyCorePlugin
4-
import com.github.jrubygradle.internal.GemVersionResolver
3+
import com.github.jrubygradle.api.core.JRubyCorePlugin
54
import com.github.jrubygradle.internal.JRubyExecDelegate
6-
import groovy.transform.CompileDynamic
75
import groovy.transform.CompileStatic
86
import org.gradle.api.Action
97
import org.gradle.api.Plugin
108
import org.gradle.api.Project
119
import org.gradle.api.Task
1210
import org.gradle.api.artifacts.Configuration
13-
import org.ysb33r.grolifant.api.TaskProvider
1411

1512
import static org.ysb33r.grolifant.api.TaskProvider.registerTask
1613

@@ -28,8 +25,6 @@ class JRubyPlugin implements Plugin<Project> {
2825
project.apply plugin: JRubyCorePlugin
2926
Configuration gems = project.configurations.create(DEFAULT_CONFIGURATION)
3027

31-
setupDefaultRepositories(project)
32-
3328
JRubyPluginExtension jruby = project.extensions.create(
3429
JRubyPluginExtension.NAME,
3530
JRubyPluginExtension,
@@ -44,18 +39,6 @@ class JRubyPlugin implements Plugin<Project> {
4439
'generateGradleRb',
4540
GenerateGradleRb
4641
).configure(generateGradleRbConfiguration(project))
47-
48-
// Set up a special configuration group for our embedding jars
49-
// project.configurations.create(JRubyExecUtils.DEFAULT_JRUBYEXEC_CONFIG)
50-
51-
}
52-
53-
@CompileDynamic
54-
private void setupDefaultRepositories(Project project) {
55-
project.afterEvaluate {
56-
GemVersionResolver.setup(project)
57-
//JRubyExec.updateJRubyDependencies(project)
58-
}
5942
}
6043

6144
private Action<? super Task> generateGradleRbConfiguration(Project project) {

‎base-plugin/src/main/groovy/com/github/jrubygradle/JRubyPluginExtension.groovy

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.github.jrubygradle
22

3-
import com.github.jrubygradle.core.JRubyAwareTask
4-
import com.github.jrubygradle.core.RepositoryHandlerExtension
3+
import com.github.jrubygradle.api.core.JRubyAwareTask
4+
import com.github.jrubygradle.api.core.RepositoryHandlerExtension
55
import com.github.jrubygradle.internal.JRubyPrepareUtils
66
import groovy.transform.CompileStatic
77
import org.gradle.api.Action

‎base-plugin/src/main/groovy/com/github/jrubygradle/JRubyPrepare.groovy

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,8 @@
11
package com.github.jrubygradle
22

3-
import com.github.jrubygradle.core.AbstractJRubyPrepare
4-
import com.github.jrubygradle.core.GemOverwriteAction
3+
import com.github.jrubygradle.api.core.AbstractJRubyPrepare
54
import com.github.jrubygradle.internal.JRubyExecUtils
65
import groovy.transform.CompileStatic
7-
import org.gradle.api.artifacts.Configuration
8-
import org.gradle.api.tasks.TaskAction
9-
10-
import static com.github.jrubygradle.core.GemOverwriteAction.SKIP
11-
import static com.github.jrubygradle.core.GemUtils.extractGems
12-
import static com.github.jrubygradle.core.GemUtils.setupJars
136

147
/**
158
* @author Schalk W. Cronjé

‎base-plugin/src/main/groovy/com/github/jrubygradle/internal/GemVersionResolver.groovy

Lines changed: 0 additions & 100 deletions
This file was deleted.

‎base-plugin/src/main/groovy/com/github/jrubygradle/internal/JRubyExecDelegate.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.github.jrubygradle.internal
22

33
import com.github.jrubygradle.JRubyPluginExtension
4-
import com.github.jrubygradle.core.JRubyExecSpec
4+
import com.github.jrubygradle.api.core.JRubyExecSpec
55
import org.gradle.api.Action
66
import org.gradle.api.Project
77
import org.gradle.api.file.FileCollection

‎base-plugin/src/main/groovy/com/github/jrubygradle/internal/JRubyExecUtils.groovy

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ package com.github.jrubygradle.internal
22

33
import com.github.jrubygradle.JRubyPlugin
44
import com.github.jrubygradle.JRubyPluginExtension
5-
import com.github.jrubygradle.core.GemOverwriteAction
6-
import com.github.jrubygradle.core.GemUtils
5+
import com.github.jrubygradle.api.gems.GemOverwriteAction
6+
import com.github.jrubygradle.api.gems.GemUtils
77
import groovy.transform.CompileDynamic
88
import groovy.transform.CompileStatic
99
import org.gradle.api.InvalidUserDataException
@@ -15,8 +15,8 @@ import org.ysb33r.grolifant.api.StringUtils
1515

1616
import java.util.regex.Matcher
1717

18-
import static com.github.jrubygradle.core.GemOverwriteAction.OVERWRITE
19-
import static com.github.jrubygradle.core.GemOverwriteAction.SKIP
18+
import static com.github.jrubygradle.api.gems.GemOverwriteAction.OVERWRITE
19+
import static com.github.jrubygradle.api.gems.GemOverwriteAction.SKIP
2020
import static org.ysb33r.grolifant.api.StringUtils.stringize
2121

2222
/**

‎base-plugin/src/test/groovy/com/github/jrubygradle/internal/GemVersionResolverSpec.groovy

Lines changed: 0 additions & 98 deletions
This file was deleted.

0 commit comments

Comments
 (0)