Skip to content

Commit b60d94c

Browse files
elizarovelizarov
committed
Move ktolinx.atomicfu support to top-level pom.xml
1 parent 7753f8e commit b60d94c

File tree

5 files changed

+28
-165
lines changed

5 files changed

+28
-165
lines changed

‎kotlinx-coroutines-core/pom.xml

Lines changed: 0 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -47,54 +47,13 @@
4747
<version>1.8.1</version>
4848
<scope>test</scope>
4949
</dependency>
50-
<dependency>
51-
<groupId>org.jetbrains.kotlinx</groupId>
52-
<artifactId>atomicfu</artifactId>
53-
<version>${atomicfu.version}</version>
54-
<scope>provided</scope>
55-
</dependency>
5650
</dependencies>
5751

5852
<build>
5953
<sourceDirectory>src/main/kotlin</sourceDirectory>
6054
<testSourceDirectory>src/test/kotlin</testSourceDirectory>
6155

6256
<plugins>
63-
<!-- compile Kotlin files to staging directory -->
64-
<plugin>
65-
<groupId>org.jetbrains.kotlin</groupId>
66-
<artifactId>kotlin-maven-plugin</artifactId>
67-
<version>${kotlin.version}</version>
68-
<executions>
69-
<execution>
70-
<id>compile</id>
71-
<phase>compile</phase>
72-
<goals>
73-
<goal>compile</goal>
74-
</goals>
75-
<configuration>
76-
<output>${project.build.directory}/classes-atomicfu</output>
77-
</configuration>
78-
</execution>
79-
</executions>
80-
</plugin>
81-
<!-- transform classes with AtomicFU plugin -->
82-
<plugin>
83-
<groupId>org.jetbrains.kotlinx</groupId>
84-
<artifactId>atomicfu-maven-plugin</artifactId>
85-
<version>${atomicfu.version}</version>
86-
<executions>
87-
<execution>
88-
<goals>
89-
<goal>transform</goal>
90-
</goals>
91-
<configuration>
92-
<verbose>true</verbose>
93-
<input>${project.build.directory}/classes-atomicfu</input>
94-
</configuration>
95-
</execution>
96-
</executions>
97-
</plugin>
9857
<!-- additional configuration for tests -->
9958
<plugin>
10059
<artifactId>maven-surefire-plugin</artifactId>

‎pom.xml

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,12 @@
147147
<version>${junit.version}</version>
148148
<scope>test</scope>
149149
</dependency>
150+
<dependency>
151+
<groupId>org.jetbrains.kotlinx</groupId>
152+
<artifactId>atomicfu</artifactId>
153+
<version>${atomicfu.version}</version>
154+
<scope>provided</scope>
155+
</dependency>
150156
</dependencies>
151157

152158
<build>
@@ -165,7 +171,7 @@
165171
</execution>
166172
</executions>
167173
</plugin>
168-
174+
<!-- compile Kotlin files to staging directory -->
169175
<plugin>
170176
<groupId>org.jetbrains.kotlin</groupId>
171177
<artifactId>kotlin-maven-plugin</artifactId>
@@ -176,6 +182,9 @@
176182
<goals>
177183
<goal>compile</goal>
178184
</goals>
185+
<configuration>
186+
<output>${project.build.directory}/classes-atomicfu</output>
187+
</configuration>
179188
</execution>
180189
<execution>
181190
<id>test-compile</id>
@@ -191,6 +200,24 @@
191200
</args>
192201
</configuration>
193202
</plugin>
203+
<!-- transform classes with AtomicFU plugin -->
204+
<plugin>
205+
<groupId>org.jetbrains.kotlinx</groupId>
206+
<artifactId>atomicfu-maven-plugin</artifactId>
207+
<version>${atomicfu.version}</version>
208+
<executions>
209+
<execution>
210+
<goals>
211+
<goal>transform</goal>
212+
</goals>
213+
<configuration>
214+
<verbose>true</verbose>
215+
<input>${project.build.directory}/classes-atomicfu</input>
216+
</configuration>
217+
</execution>
218+
</executions>
219+
</plugin>
220+
<!-- documentation -->
194221
<plugin>
195222
<groupId>org.jetbrains.dokka</groupId>
196223
<artifactId>dokka-maven-plugin</artifactId>

‎reactive/kotlinx-coroutines-reactive/pom.xml

Lines changed: 0 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -34,41 +34,6 @@
3434
<testSourceDirectory>src/test/kotlin</testSourceDirectory>
3535

3636
<plugins>
37-
<!-- compile Kotlin files to staging directory -->
38-
<plugin>
39-
<groupId>org.jetbrains.kotlin</groupId>
40-
<artifactId>kotlin-maven-plugin</artifactId>
41-
<version>${kotlin.version}</version>
42-
<executions>
43-
<execution>
44-
<id>compile</id>
45-
<phase>compile</phase>
46-
<goals>
47-
<goal>compile</goal>
48-
</goals>
49-
<configuration>
50-
<output>${project.build.directory}/classes-atomicfu</output>
51-
</configuration>
52-
</execution>
53-
</executions>
54-
</plugin>
55-
<!-- transform classes with AtomicFU plugin -->
56-
<plugin>
57-
<groupId>org.jetbrains.kotlinx</groupId>
58-
<artifactId>atomicfu-maven-plugin</artifactId>
59-
<version>${atomicfu.version}</version>
60-
<executions>
61-
<execution>
62-
<goals>
63-
<goal>transform</goal>
64-
</goals>
65-
<configuration>
66-
<verbose>true</verbose>
67-
<input>${project.build.directory}/classes-atomicfu</input>
68-
</configuration>
69-
</execution>
70-
</executions>
71-
</plugin>
7237
<!-- documentation -->
7338
<plugin>
7439
<groupId>org.jetbrains.dokka</groupId>
@@ -109,12 +74,6 @@
10974
<classifier>tests</classifier>
11075
<scope>test</scope>
11176
</dependency>
112-
<dependency>
113-
<groupId>org.jetbrains.kotlinx</groupId>
114-
<artifactId>atomicfu</artifactId>
115-
<version>${atomicfu.version}</version>
116-
<scope>provided</scope>
117-
</dependency>
11877
</dependencies>
11978

12079
</project>

‎reactive/kotlinx-coroutines-rx1/pom.xml

Lines changed: 0 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -34,41 +34,6 @@
3434
<testSourceDirectory>src/test/kotlin</testSourceDirectory>
3535

3636
<plugins>
37-
<!-- compile Kotlin files to staging directory -->
38-
<plugin>
39-
<groupId>org.jetbrains.kotlin</groupId>
40-
<artifactId>kotlin-maven-plugin</artifactId>
41-
<version>${kotlin.version}</version>
42-
<executions>
43-
<execution>
44-
<id>compile</id>
45-
<phase>compile</phase>
46-
<goals>
47-
<goal>compile</goal>
48-
</goals>
49-
<configuration>
50-
<output>${project.build.directory}/classes-atomicfu</output>
51-
</configuration>
52-
</execution>
53-
</executions>
54-
</plugin>
55-
<!-- transform classes with AtomicFU plugin -->
56-
<plugin>
57-
<groupId>org.jetbrains.kotlinx</groupId>
58-
<artifactId>atomicfu-maven-plugin</artifactId>
59-
<version>${atomicfu.version}</version>
60-
<executions>
61-
<execution>
62-
<goals>
63-
<goal>transform</goal>
64-
</goals>
65-
<configuration>
66-
<verbose>true</verbose>
67-
<input>${project.build.directory}/classes-atomicfu</input>
68-
</configuration>
69-
</execution>
70-
</executions>
71-
</plugin>
7237
<!-- documentation -->
7338
<plugin>
7439
<groupId>org.jetbrains.dokka</groupId>
@@ -109,12 +74,6 @@
10974
<classifier>tests</classifier>
11075
<scope>test</scope>
11176
</dependency>
112-
<dependency>
113-
<groupId>org.jetbrains.kotlinx</groupId>
114-
<artifactId>atomicfu</artifactId>
115-
<version>${atomicfu.version}</version>
116-
<scope>provided</scope>
117-
</dependency>
11877
</dependencies>
11978

12079
</project>

‎reactive/kotlinx-coroutines-rx2/pom.xml

Lines changed: 0 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -34,41 +34,6 @@
3434
<testSourceDirectory>src/test/kotlin</testSourceDirectory>
3535

3636
<plugins>
37-
<!-- compile Kotlin files to staging directory -->
38-
<plugin>
39-
<groupId>org.jetbrains.kotlin</groupId>
40-
<artifactId>kotlin-maven-plugin</artifactId>
41-
<version>${kotlin.version}</version>
42-
<executions>
43-
<execution>
44-
<id>compile</id>
45-
<phase>compile</phase>
46-
<goals>
47-
<goal>compile</goal>
48-
</goals>
49-
<configuration>
50-
<output>${project.build.directory}/classes-atomicfu</output>
51-
</configuration>
52-
</execution>
53-
</executions>
54-
</plugin>
55-
<!-- transform classes with AtomicFU plugin -->
56-
<plugin>
57-
<groupId>org.jetbrains.kotlinx</groupId>
58-
<artifactId>atomicfu-maven-plugin</artifactId>
59-
<version>${atomicfu.version}</version>
60-
<executions>
61-
<execution>
62-
<goals>
63-
<goal>transform</goal>
64-
</goals>
65-
<configuration>
66-
<verbose>true</verbose>
67-
<input>${project.build.directory}/classes-atomicfu</input>
68-
</configuration>
69-
</execution>
70-
</executions>
71-
</plugin>
7237
<!-- documentation -->
7338
<plugin>
7439
<groupId>org.jetbrains.dokka</groupId>
@@ -115,12 +80,6 @@
11580
<classifier>tests</classifier>
11681
<scope>test</scope>
11782
</dependency>
118-
<dependency>
119-
<groupId>org.jetbrains.kotlinx</groupId>
120-
<artifactId>atomicfu</artifactId>
121-
<version>${atomicfu.version}</version>
122-
<scope>provided</scope>
123-
</dependency>
12483
</dependencies>
12584

12685
</project>

0 commit comments

Comments
 (0)