Moving all java classes into Kotlin (#13)

duxtinto · Feb 6, 2018 · dd866ca · dd866ca
1 parent babf642
commit dd866ca
Show file tree

Hide file tree

Showing 83 changed files with 838 additions and 1,118 deletions.
diff --git a/build.gradle b/build.gradle
@@ -13,7 +13,6 @@ buildscript {
 }
 
 plugins {
-    id 'net.ltgt.apt-idea' version '0.13'
     id 'org.jetbrains.intellij' version '0.2.17'
     id "org.jetbrains.kotlin.jvm" version "1.2.21"
     id "org.jetbrains.kotlin.plugin.allopen" version "1.2.21"
@@ -39,7 +38,6 @@ allprojects {
 
 sourceSets {
     main {
-        java.srcDir 'src/main/java'
         kotlin.srcDirs 'src/main/kotlin'
         resources.srcDir 'src/main/resources'
     }
@@ -55,12 +53,4 @@ dependencies {
             "com.google.dagger:dagger:${project.versions.dagger}",
             "org.jsoup:jsoup:${project.versions.jsoup}",
     )
-
-    compileOnly "com.google.auto.value:auto-value:${project.versions.auto_value}"
-
-    apt(
-            "com.google.dagger:dagger-compiler:${project.versions.dagger}",
-            "com.google.auto:auto-common:${project.versions.auto_common}",
-            "com.google.auto.value:auto-value:${project.versions.auto_value}",
-    )
 }
diff --git a/github_code_review.iml b/github_code_review.iml
@@ -38,6 +38,7 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
       <excludeFolder url="file://$MODULE_DIR$/.gradle" />
+      <excludeFolder url="file://$MODULE_DIR$/build" />
       <excludeFolder url="file://$MODULE_DIR$/build/classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/distributions" />
       <excludeFolder url="file://$MODULE_DIR$/build/idea-sandbox" />
@@ -50,19 +51,12 @@
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
       <excludeFolder url="file://$MODULE_DIR$/out" />
     </content>
-    <content url="file://$MODULE_DIR$/build/generated/source/apt/main">
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/main" isTestSource="false" generated="true" />
-    </content>
-    <content url="file://$MODULE_DIR$/build/generated/source/apt/test">
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/test" isTestSource="true" generated="true" />
-    </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" scope="PROVIDED" name="Gradle: com.google.guava:guava:23.6-jre" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Gradle: com.google.dagger:dagger:2.14" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Gradle: org.jsoup:jsoup:1.11.2" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.2.21" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Gradle: com.google.auto.value:auto-value:1.5" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Gradle: com.jetbrains:sqlite-jdbc-3.16.1:2017.3.2" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Gradle: com.jetbrains:jsch.agentproxy.connector-factory:2017.3.2" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Gradle: com.jetbrains:google-analytics-library:2017.3.2" level="project" />
@@ -215,18 +209,6 @@
     <orderEntry type="library" scope="PROVIDED" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.21" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.2.21" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Gradle: org.jetbrains:annotations:13.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Gradle: com.google.dagger:dagger-compiler:2.14" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Gradle: com.google.auto:auto-common:0.9" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Gradle: com.google.dagger:dagger-spi:2.14" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Gradle: com.google.dagger:dagger-producers:2.14" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Gradle: com.google.googlejavaformat:google-java-format:1.4" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Gradle: com.google.guava:guava:23.5-jre" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Gradle: com.squareup:javapoet:1.8.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Gradle: javax.annotation:jsr250-api:1.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Gradle: org.checkerframework:checker-compat-qual:2.3.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Gradle: com.google.errorprone:javac-shaded:9-dev-r4023-3" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Gradle: org.checkerframework:checker-qual:2.0.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Gradle: com.google.errorprone:error_prone_annotations:2.0.18" level="project" />
     <orderEntry type="library" scope="RUNTIME" name="Gradle: com.google.guava:guava:23.6-jre" level="project" />
     <orderEntry type="library" scope="RUNTIME" name="Gradle: com.google.dagger:dagger:2.14" level="project" />
     <orderEntry type="library" scope="RUNTIME" name="Gradle: org.jsoup:jsoup:1.11.2" level="project" />

diff --git a/gradle/scripts/dependencies.build.gradle b/gradle/scripts/dependencies.build.gradle
@@ -10,7 +10,6 @@ ext {
             guava         : '23.6-jre',
             dagger        : '2.14',
             auto_common   : '0.9',
-            auto_value    : '1.5',
             jsoup         : '1.11.2',
 
             // Testing

diff --git a/gradle/scripts/kotlin.build.gradle b/gradle/scripts/kotlin.build.gradle
@@ -6,7 +6,6 @@ dependencies {
     kapt(
             "com.google.dagger:dagger-compiler:${project.versions.dagger}",
             "com.google.auto:auto-common:${project.versions.auto_common}",
-            "com.google.auto.value:auto-value:${project.versions.auto_value}",
     )
 }
 

diff --git a/gradle/scripts/testing.build.gradle b/gradle/scripts/testing.build.gradle
@@ -2,10 +2,7 @@ apply plugin: 'org.junit.platform.gradle.plugin'
 
 sourceSets {
     test {
-        java.srcDirs += [
-                'src/test/java',
-        ]
-        java.srcDirs += [
+        kotlin.srcDirs += [
                 'src/commonTest/kotlin',
                 'src/test/kotlin',
                 'src/uiTest/kotlin'

diff --git a/...tinto/intellij/plugin/github/codereviews/data/pullrequests/PullRequestRepositoryImpl.java b/...tinto/intellij/plugin/github/codereviews/data/pullrequests/PullRequestRepositoryImpl.java
diff --git a/...n/java/com/duxtinto/intellij/plugin/github/codereviews/di/contracts/DiContainerAware.java b/...n/java/com/duxtinto/intellij/plugin/github/codereviews/di/contracts/DiContainerAware.java
diff --git a/.../com/duxtinto/intellij/plugin/github/codereviews/di/impl/dagger/ApplicationContainer.java b/.../com/duxtinto/intellij/plugin/github/codereviews/di/impl/dagger/ApplicationContainer.java
diff --git a/...java/com/duxtinto/intellij/plugin/github/codereviews/di/impl/dagger/ProjectContainer.java b/...java/com/duxtinto/intellij/plugin/github/codereviews/di/impl/dagger/ProjectContainer.java
diff --git a/...duxtinto/intellij/plugin/github/codereviews/di/impl/dagger/modules/ApplicationModule.java b/...duxtinto/intellij/plugin/github/codereviews/di/impl/dagger/modules/ApplicationModule.java
diff --git a/...va/com/duxtinto/intellij/plugin/github/codereviews/di/impl/dagger/modules/AuthModule.java b/...va/com/duxtinto/intellij/plugin/github/codereviews/di/impl/dagger/modules/AuthModule.java
diff --git a/...a/com/duxtinto/intellij/plugin/github/codereviews/di/impl/dagger/modules/IssueModule.java b/...a/com/duxtinto/intellij/plugin/github/codereviews/di/impl/dagger/modules/IssueModule.java
diff --git a/...a/com/duxtinto/intellij/plugin/github/codereviews/di/impl/dagger/modules/ReposModule.java b/...a/com/duxtinto/intellij/plugin/github/codereviews/di/impl/dagger/modules/ReposModule.java
diff --git a/src/main/java/com/duxtinto/intellij/plugin/github/codereviews/di/scopes/ProjectScoped.java b/src/main/java/com/duxtinto/intellij/plugin/github/codereviews/di/scopes/ProjectScoped.java
diff --git a/...a/com/duxtinto/intellij/plugin/github/codereviews/domain/issues/IssuesDomainContract.java b/...a/com/duxtinto/intellij/plugin/github/codereviews/domain/issues/IssuesDomainContract.java
diff --git a/...om/duxtinto/intellij/plugin/github/codereviews/domain/issues/SwitchToIssueInteractor.java b/...om/duxtinto/intellij/plugin/github/codereviews/domain/issues/SwitchToIssueInteractor.java
diff --git a/...nto/intellij/plugin/github/codereviews/domain/pullrequests/PullRequestDomainContract.java b/...nto/intellij/plugin/github/codereviews/domain/pullrequests/PullRequestDomainContract.java
diff --git a/.../plugin/github/codereviews/domain/repositories/FindGithubRepoForRootFolderInteractor.java b/.../plugin/github/codereviews/domain/repositories/FindGithubRepoForRootFolderInteractor.java
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,7 +6,6 @@ dependencies { @@
         kapt(
                 "com.google.dagger:dagger-compiler:${project.versions.dagger}",
                 "com.google.auto:auto-common:${project.versions.auto_common}",
-                "com.google.auto.value:auto-value:${project.versions.auto_value}",
         )
     }
@@ Expand Down @@