diff --git a/build.gradle b/build.gradle index cc74caccc..7de5eb75d 100644 --- a/build.gradle +++ b/build.gradle @@ -35,9 +35,6 @@ plugins { // Java static analysis plugins. Keep versions consistent with // ./buildSrc/build.gradle id 'nebula.lint' version '16.0.2' - // TODO(weiminyu): consider remove net.ltgt.apt. Gradle 5.2+ - // has similar functionalities. - id 'net.ltgt.apt' version '0.19' apply false id 'net.ltgt.errorprone' version '0.6.1' id 'checkstyle' id 'com.github.johnrengelman.shadow' version '5.1.0' @@ -290,12 +287,6 @@ subprojects { project.tasks.test.dependsOn runPresubmits -// Path to code generated with annotation processors. Note that this path is -// chosen by the 'net.ltgt.apt' plugin, and may change if IDE-specific plugins -// are applied, e.g., 'idea' or 'eclipse' - def aptGeneratedDir = "${project.buildDir}/generated/source/apt/main" - def aptGeneratedTestDir = "${project.buildDir}/generated/source/apt/test" - def commonlyExcludedResources = ['**/*.java', '**/BUILD'] project.ext.javaDir = "${project.projectDir}/src/main/java" @@ -304,18 +295,12 @@ subprojects { sourceSets { main { - java { - srcDirs += aptGeneratedDir - } resources { srcDirs += project.ext.javaDir exclude commonlyExcludedResources } } test { - java { - srcDirs += aptGeneratedTestDir - } resources { srcDirs += project.ext.javaTestDir exclude commonlyExcludedResources diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle index 3a60cb440..e2d2e5e58 100644 --- a/buildSrc/build.gradle +++ b/buildSrc/build.gradle @@ -26,9 +26,6 @@ buildscript { plugins { // Java static analysis plugins. Keep versions consistent with ../build.gradle id 'nebula.lint' version '16.0.2' - // Config helper for annotation processors such as AutoValue and Dagger. - // Ensures that source code is generated at an appropriate location. - id 'net.ltgt.apt' version '0.19' apply false id 'net.ltgt.errorprone' version '0.6.1' id 'checkstyle' id 'com.diffplug.gradle.spotless' version '3.25.0' diff --git a/buildSrc/gradle/dependency-locks/buildscript-classpath.lockfile b/buildSrc/gradle/dependency-locks/buildscript-classpath.lockfile index 4ba4301e9..bdb0d49ee 100644 --- a/buildSrc/gradle/dependency-locks/buildscript-classpath.lockfile +++ b/buildSrc/gradle/dependency-locks/buildscript-classpath.lockfile @@ -19,9 +19,7 @@ commons-lang:commons-lang:2.6 javax.inject:javax.inject:1 junit:junit:4.12 nebula.lint:nebula.lint.gradle.plugin:16.0.2 -net.ltgt.apt:net.ltgt.apt.gradle.plugin:0.19 net.ltgt.errorprone:net.ltgt.errorprone.gradle.plugin:0.6.1 -net.ltgt.gradle:gradle-apt-plugin:0.19 net.ltgt.gradle:gradle-errorprone-plugin:0.6.1 org.apache.commons:commons-lang3:3.8.1 org.apache.maven:maven-artifact:3.6.2 diff --git a/common/gradle/dependency-locks/apt.lockfile b/common/gradle/dependency-locks/apt.lockfile deleted file mode 100644 index 656c5dbcc..000000000 --- a/common/gradle/dependency-locks/apt.lockfile +++ /dev/null @@ -1,3 +0,0 @@ -# This is a Gradle generated file for dependency locking. -# Manual edits can break the build and are not advised. -# This file is expected to be part of source control. diff --git a/common/gradle/dependency-locks/testApt.lockfile b/common/gradle/dependency-locks/testApt.lockfile deleted file mode 100644 index 656c5dbcc..000000000 --- a/common/gradle/dependency-locks/testApt.lockfile +++ /dev/null @@ -1,3 +0,0 @@ -# This is a Gradle generated file for dependency locking. -# Manual edits can break the build and are not advised. -# This file is expected to be part of source control. diff --git a/common/gradle/dependency-locks/testingApt.lockfile b/common/gradle/dependency-locks/testingApt.lockfile deleted file mode 100644 index 656c5dbcc..000000000 --- a/common/gradle/dependency-locks/testingApt.lockfile +++ /dev/null @@ -1,3 +0,0 @@ -# This is a Gradle generated file for dependency locking. -# Manual edits can break the build and are not advised. -# This file is expected to be part of source control. diff --git a/core/build.gradle b/core/build.gradle index 85bdbbd61..1f7fd85ea 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -22,7 +22,7 @@ plugins { // Path to code generated by ad hoc tasks in this project. A separate path is // used for easy inspection. -def generatedDir = "${project.buildDir}/generated/source/custom/main" +def generatedDir = "${project.buildDir}/generated/sources/custom/java/main" def resourcesDir = "${project.buildDir}/resources/main" def screenshotsDir = "${project.buildDir}/screenshots" def screenshotsForGoldensDir = "${project.buildDir}/screenshots_for_goldens" diff --git a/core/gradle/dependency-locks/apt.lockfile b/core/gradle/dependency-locks/apt.lockfile deleted file mode 100644 index 656c5dbcc..000000000 --- a/core/gradle/dependency-locks/apt.lockfile +++ /dev/null @@ -1,3 +0,0 @@ -# This is a Gradle generated file for dependency locking. -# Manual edits can break the build and are not advised. -# This file is expected to be part of source control. diff --git a/core/gradle/dependency-locks/nonprodApt.lockfile b/core/gradle/dependency-locks/nonprodApt.lockfile deleted file mode 100644 index 656c5dbcc..000000000 --- a/core/gradle/dependency-locks/nonprodApt.lockfile +++ /dev/null @@ -1,3 +0,0 @@ -# This is a Gradle generated file for dependency locking. -# Manual edits can break the build and are not advised. -# This file is expected to be part of source control. diff --git a/core/gradle/dependency-locks/testApt.lockfile b/core/gradle/dependency-locks/testApt.lockfile deleted file mode 100644 index 656c5dbcc..000000000 --- a/core/gradle/dependency-locks/testApt.lockfile +++ /dev/null @@ -1,3 +0,0 @@ -# This is a Gradle generated file for dependency locking. -# Manual edits can break the build and are not advised. -# This file is expected to be part of source control. diff --git a/core/karma.conf.js b/core/karma.conf.js index 232cdaf48..90b5f47cf 100644 --- a/core/karma.conf.js +++ b/core/karma.conf.js @@ -39,7 +39,7 @@ module.exports = function(config) { included: false }, { - pattern: 'core/build/generated/source/custom/main/**/*.soy.js', + pattern: 'core/build/generated/sources/custom/java/main/**/*.soy.js', included: false }, { @@ -65,7 +65,7 @@ module.exports = function(config) { 'node_modules/google-closure-library/closure/goog/base.js': ['closure'], 'node_modules/google-closure-library/closure/**/*.js': ['closure'], 'core/src/*/javascript/**/*.js': ['closure'], - 'core/build/generated/source/custom/main/**/*.soy.js': ['closure'], + 'core/build/generated/sources/custom/java/main/**/*.soy.js': ['closure'], }, proxies: { "/assets/": "/base/core/build/resources/main/google/registry/ui/assets/" diff --git a/core/src/main/java/google/registry/model/contact/ContactBase.java b/core/src/main/java/google/registry/model/contact/ContactBase.java index b2f50a5e7..0d4dd6f90 100644 --- a/core/src/main/java/google/registry/model/contact/ContactBase.java +++ b/core/src/main/java/google/registry/model/contact/ContactBase.java @@ -44,10 +44,11 @@ import org.joda.time.DateTime; /** * A persistable contact resource including mutable and non-mutable fields. * + *

This class deliberately does not include an {@link javax.persistence.Id} so that any + * foreign-keyed fields can refer to the proper parent entity's ID, whether we're storing this in + * the DB itself or as part of another entity + * * @see RFC 5733 - *

This class deliberately does not include an {@link javax.persistence.Id} so that any - * foreign-keyed fields can refer to the proper parent entity's ID, whether we're storing this - * in the DB itself or as part of another entity */ @MappedSuperclass @Embeddable diff --git a/db/gradle/dependency-locks/apt.lockfile b/db/gradle/dependency-locks/apt.lockfile deleted file mode 100644 index 656c5dbcc..000000000 --- a/db/gradle/dependency-locks/apt.lockfile +++ /dev/null @@ -1,3 +0,0 @@ -# This is a Gradle generated file for dependency locking. -# Manual edits can break the build and are not advised. -# This file is expected to be part of source control. diff --git a/db/gradle/dependency-locks/testApt.lockfile b/db/gradle/dependency-locks/testApt.lockfile deleted file mode 100644 index 656c5dbcc..000000000 --- a/db/gradle/dependency-locks/testApt.lockfile +++ /dev/null @@ -1,3 +0,0 @@ -# This is a Gradle generated file for dependency locking. -# Manual edits can break the build and are not advised. -# This file is expected to be part of source control. diff --git a/gradle/dependency-locks/buildscript-classpath.lockfile b/gradle/dependency-locks/buildscript-classpath.lockfile index 6fbfd5405..e9c711a32 100644 --- a/gradle/dependency-locks/buildscript-classpath.lockfile +++ b/gradle/dependency-locks/buildscript-classpath.lockfile @@ -34,9 +34,7 @@ gradle.plugin.com.dorongold.plugins:task-tree:1.5 javax.inject:javax.inject:1 junit:junit:4.12 nebula.lint:nebula.lint.gradle.plugin:16.0.2 -net.ltgt.apt:net.ltgt.apt.gradle.plugin:0.19 net.ltgt.errorprone:net.ltgt.errorprone.gradle.plugin:0.6.1 -net.ltgt.gradle:gradle-apt-plugin:0.19 net.ltgt.gradle:gradle-errorprone-plugin:0.6.1 org.apache.ant:ant-launcher:1.9.7 org.apache.ant:ant:1.9.7 diff --git a/java_common.gradle b/java_common.gradle index 733a32565..cea8b24f2 100644 --- a/java_common.gradle +++ b/java_common.gradle @@ -14,7 +14,6 @@ apply plugin: 'java' apply plugin: 'nebula.lint' -apply plugin: 'net.ltgt.apt' apply plugin: 'net.ltgt.errorprone' apply plugin: 'checkstyle' apply plugin: 'jacoco' diff --git a/networking/gradle/dependency-locks/apt.lockfile b/networking/gradle/dependency-locks/apt.lockfile deleted file mode 100644 index 656c5dbcc..000000000 --- a/networking/gradle/dependency-locks/apt.lockfile +++ /dev/null @@ -1,3 +0,0 @@ -# This is a Gradle generated file for dependency locking. -# Manual edits can break the build and are not advised. -# This file is expected to be part of source control. diff --git a/networking/gradle/dependency-locks/testApt.lockfile b/networking/gradle/dependency-locks/testApt.lockfile deleted file mode 100644 index 656c5dbcc..000000000 --- a/networking/gradle/dependency-locks/testApt.lockfile +++ /dev/null @@ -1,3 +0,0 @@ -# This is a Gradle generated file for dependency locking. -# Manual edits can break the build and are not advised. -# This file is expected to be part of source control. diff --git a/prober/gradle/dependency-locks/apt.lockfile b/prober/gradle/dependency-locks/apt.lockfile deleted file mode 100644 index 656c5dbcc..000000000 --- a/prober/gradle/dependency-locks/apt.lockfile +++ /dev/null @@ -1,3 +0,0 @@ -# This is a Gradle generated file for dependency locking. -# Manual edits can break the build and are not advised. -# This file is expected to be part of source control. diff --git a/prober/gradle/dependency-locks/testApt.lockfile b/prober/gradle/dependency-locks/testApt.lockfile deleted file mode 100644 index 656c5dbcc..000000000 --- a/prober/gradle/dependency-locks/testApt.lockfile +++ /dev/null @@ -1,3 +0,0 @@ -# This is a Gradle generated file for dependency locking. -# Manual edits can break the build and are not advised. -# This file is expected to be part of source control. diff --git a/processor/gradle/dependency-locks/apt.lockfile b/processor/gradle/dependency-locks/apt.lockfile deleted file mode 100644 index 656c5dbcc..000000000 --- a/processor/gradle/dependency-locks/apt.lockfile +++ /dev/null @@ -1,3 +0,0 @@ -# This is a Gradle generated file for dependency locking. -# Manual edits can break the build and are not advised. -# This file is expected to be part of source control. diff --git a/processor/gradle/dependency-locks/testApt.lockfile b/processor/gradle/dependency-locks/testApt.lockfile deleted file mode 100644 index 656c5dbcc..000000000 --- a/processor/gradle/dependency-locks/testApt.lockfile +++ /dev/null @@ -1,3 +0,0 @@ -# This is a Gradle generated file for dependency locking. -# Manual edits can break the build and are not advised. -# This file is expected to be part of source control. diff --git a/proxy/gradle/dependency-locks/apt.lockfile b/proxy/gradle/dependency-locks/apt.lockfile deleted file mode 100644 index 656c5dbcc..000000000 --- a/proxy/gradle/dependency-locks/apt.lockfile +++ /dev/null @@ -1,3 +0,0 @@ -# This is a Gradle generated file for dependency locking. -# Manual edits can break the build and are not advised. -# This file is expected to be part of source control. diff --git a/proxy/gradle/dependency-locks/testApt.lockfile b/proxy/gradle/dependency-locks/testApt.lockfile deleted file mode 100644 index 656c5dbcc..000000000 --- a/proxy/gradle/dependency-locks/testApt.lockfile +++ /dev/null @@ -1,3 +0,0 @@ -# This is a Gradle generated file for dependency locking. -# Manual edits can break the build and are not advised. -# This file is expected to be part of source control. diff --git a/util/gradle/dependency-locks/apt.lockfile b/util/gradle/dependency-locks/apt.lockfile deleted file mode 100644 index 656c5dbcc..000000000 --- a/util/gradle/dependency-locks/apt.lockfile +++ /dev/null @@ -1,3 +0,0 @@ -# This is a Gradle generated file for dependency locking. -# Manual edits can break the build and are not advised. -# This file is expected to be part of source control. diff --git a/util/gradle/dependency-locks/testApt.lockfile b/util/gradle/dependency-locks/testApt.lockfile deleted file mode 100644 index 656c5dbcc..000000000 --- a/util/gradle/dependency-locks/testApt.lockfile +++ /dev/null @@ -1,3 +0,0 @@ -# This is a Gradle generated file for dependency locking. -# Manual edits can break the build and are not advised. -# This file is expected to be part of source control.