Skip to content

Commit

Permalink
Kjør ktlint med nyeste versjon (#30)
Browse files Browse the repository at this point in the history 
* Kjør ktlint med nyeste versjon

* Kjør ktlint med nyeste versjon
  • Loading branch information
@ugur93
ugur93 authored Jan 11, 2024
1 parent 69b2c1f commit c09fc16
Show file tree
Hide file tree
Showing 93 changed files with 1,122 additions and 1,092 deletions.
42 changes: 0 additions & 42 deletions bidrag-commons/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -203,48 +203,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>${maven-antrun.version}</version>
<executions>
<execution>
<id>ktlint</id>
<phase>verify</phase>
<configuration>
<target name="ktlint">
<java taskname="ktlint" dir="${basedir}" fork="true" failonerror="true" classpathref="maven.plugin.classpath" classname="com.pinterest.ktlint.Main">
<arg value="src/**/*.kt"/>
</java>
</target>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
<execution>
<id>ktlint-format</id>
<phase>validate</phase>
<configuration>
<target name="ktlint">
<java taskname="ktlint" dir="${basedir}" fork="true" failonerror="true" classpathref="maven.plugin.classpath" classname="com.pinterest.ktlint.Main">
<jvmarg value="--add-opens"/>
<jvmarg value="java.base/java.lang=ALL-UNNAMED"/>
<arg value="-F"/>
<arg value="src/**/*.kt"/>
</java>
</target>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
</executions>
<dependencies>
<dependency>
<groupId>com.pinterest.ktlint</groupId>
<artifactId>ktlint-cli</artifactId>
<version>${ktlint.version}</version>
</dependency>
<!-- additional 3rd party ruleset(s) can be specified here -->
</dependencies>
</plugin>
</plugins>
</build>
Expand Down
44 changes: 0 additions & 44 deletions bidrag-domene/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,50 +101,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>${maven-antrun.version}</version>
<executions>
<execution>
<id>ktlint</id>
<phase>verify</phase>
<configuration>
<target name="ktlint">
<java taskname="ktlint" dir="${basedir}" fork="true" failonerror="true"
classpathref="maven.plugin.classpath" classname="com.pinterest.ktlint.Main">
<arg value="src/**/*.kt"/>
</java>
</target>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
<execution>
<id>ktlint-format</id>
<phase>validate</phase>
<configuration>
<target name="ktlint">
<java taskname="ktlint" dir="${basedir}" fork="true" failonerror="true"
classpathref="maven.plugin.classpath" classname="com.pinterest.ktlint.Main">
<jvmarg value="--add-opens"/>
<jvmarg value="java.base/java.lang=ALL-UNNAMED"/>
<arg value="-F"/>
<arg value="src/**/*.kt"/>
</java>
</target>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
</executions>
<dependencies>
<dependency>
<groupId>com.pinterest</groupId>
<artifactId>ktlint</artifactId>
<version>0.50.0</version>
</dependency>
<!-- additional 3rd party ruleset(s) can be specified here -->
</dependencies>
</plugin>
</plugins>
</build>
Expand Down
4 changes: 3 additions & 1 deletion ...ag-domene/src/main/kotlin/no/nav/bidrag/domene/enums/beregning/ResultatkodeBarnebidrag.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@ package no.nav.bidrag.domene.enums.beregning

enum class ResultatkodeBarnebidrag {
BARNET_ER_SELVFORSØRGET, // Barnet er selvforsørget
BEGRENSET_EVNE_FLERE_SAKER_UTFØR_FORHOLDSMESSIG_FORDELING, // Resultat av beregning av barnebidrag, angir at det må gjøres en forholdsmessig fordeling

// Resultat av beregning av barnebidrag, angir at det må gjøres en forholdsmessig fordeling
BEGRENSET_EVNE_FLERE_SAKER_UTFØR_FORHOLDSMESSIG_FORDELING,
BEGRENSET_REVURDERING, // Beregnet bidrag er større enn forskuddsats, settes lik forskuddssats
BIDRAG_IKKE_BEREGNET_DELT_BOSTED, // Barnet har delt bosted og BPs andel av U er under 50%, bidrag skal ikke beregnes
BIDRAG_REDUSERT_AV_EVNE, // Bidrag redusert pga ikke full evne
Expand Down
Loading

0 comments on commit c09fc16

Please sign in to comment.