Skip to content

Commit f0dd638

Browse files
committed
Remove pcollections-based implementations
pcollections shadowing is no longer required, so remove shadow plugin and cleanup build scripts.
1 parent c7aceab commit f0dd638

File tree

13 files changed

+4
-860
lines changed

13 files changed

+4
-860
lines changed

.gitmodules

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +0,0 @@
1-
[submodule "pcollections"]
2-
path = pcollections
3-
url = https://github.com/ilya-g/pcollections.git
4-
branch = dev

README.md

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ Immutable collection interfaces and implementation prototypes for Kotlin.
66

77
For further details see the [proposal](proposal.md).
88

9-
Prototype implementation is based on [pcollections](https://pcollections.org/) (Copyright 2015 The pcollections Authors.)
10-
119
## What's in this library
1210
### Interfaces and implementations
1311

@@ -125,11 +123,6 @@ compile 'org.jetbrains.kotlinx:kotlinx-collections-immutable:0.1'
125123

126124
## Building from source
127125

128-
To initialize submodules after checkout, use the following commands:
129-
130-
git submodule init
131-
git submodule update
132-
133-
Then you can build and install artifacts to maven local with:
126+
You can build and install artifacts to maven local with:
134127

135128
gradlew build install

build.gradle

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1 @@
11
ext.JDK_16 = System.getenv("JDK_16")
2-
3-
project('pcollections') {
4-
afterEvaluate {
5-
compileJava {
6-
options.fork = true
7-
options.forkOptions.executable = "${JDK_16}/bin/javac"
8-
}
9-
}
10-
}

kotlinx-collections-immutable/build.gradle

Lines changed: 3 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ buildscript {
66
}
77
dependencies {
88
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
9-
classpath 'com.github.jengelman.gradle.plugins:shadow:1.2.4'
109
}
1110
}
1211

@@ -27,24 +26,15 @@ allprojects {
2726
testCompile "junit:junit:4.12"
2827
}
2928
}
30-
apply plugin: 'com.github.johnrengelman.shadow'
31-
32-
configurations {
33-
shadowed
34-
compile.extendsFrom(shadow)
35-
compile.extendsFrom(shadowed)
36-
}
3729

3830
dependencies {
39-
shadow "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
40-
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
41-
shadowed project(':pcollections')
31+
api "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
4232
}
4333

4434
project('tests') {
4535
dependencies {
46-
compile project(path: ':kotlinx-collections-immutable', configuration: 'shadow')
47-
testCompile 'com.google.guava:guava-testlib:18.0'
36+
implementation project(path: ':kotlinx-collections-immutable')
37+
testImplementation 'com.google.guava:guava-testlib:18.0'
4838
}
4939
}
5040

@@ -59,14 +49,6 @@ apply plugin: 'signing'
5949
apply plugin: 'maven'
6050

6151

62-
63-
64-
shadowJar {
65-
classifier = null
66-
configurations = [project.configurations.shadowed]
67-
relocate 'org.pcollections', 'kotlinx.collections.immutable.internal.org.pcollections'
68-
}
69-
7052
task sourcesJar(type: Jar) {
7153
from sourceSets.main.allSource
7254
classifier "sources"
@@ -83,7 +65,6 @@ task javadocJar(type: Jar, dependsOn: emptyJavadoc) {
8365
}
8466

8567
artifacts {
86-
archives shadowJar
8768
archives sourcesJar
8869
archives javadocJar
8970
}

kotlinx-collections-immutable/src/main/kotlin/kotlinx/collections/immutable/AbstractImmutableMap.kt

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

kotlinx-collections-immutable/src/main/kotlin/kotlinx/collections/immutable/AbstractImmutableSet.kt

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

0 commit comments

Comments
 (0)