Delete the buildSrc directory.

Moved all of the stuff we were using it for into build-logic.
This commit is contained in:
Greyson Parrelli
2023-02-25 11:06:51 -05:00
committed by Nicholas Tinsley
parent 873552436a
commit 21deb6803c
8 changed files with 18 additions and 17 deletions

View File

@@ -11,9 +11,9 @@ plugins {
id 'kotlin-parcelize' id 'kotlin-parcelize'
id 'com.squareup.wire' id 'com.squareup.wire'
id 'android-constants' id 'android-constants'
id 'translations'
} }
apply from: 'translations.gradle'
apply from: 'static-ips.gradle' apply from: 'static-ips.gradle'
protobuf { protobuf {

View File

@@ -5,4 +5,5 @@ plugins {
dependencies { dependencies {
implementation libs.android.library implementation libs.android.library
implementation libs.android.application implementation libs.android.application
implementation project(':tools')
} }

View File

@@ -1,7 +1,7 @@
import groovy.io.FileType import groovy.io.FileType
import groovy.transform.stc.ClosureParams import groovy.transform.stc.ClosureParams
import groovy.transform.stc.SimpleType import groovy.transform.stc.SimpleType
import org.signal.StaticIpResolver import org.signal.buildtools.StaticIpResolver
ext { ext {
autoResConfig = this.&autoResConfig autoResConfig = this.&autoResConfig

View File

@@ -18,5 +18,6 @@ dependencyResolutionManagement {
rootProject.name = "build-logic" rootProject.name = "build-logic"
include ':plugins' include ':plugins'
include ':tools'
apply from: '../dependencies.gradle' apply from: '../dependencies.gradle'

View File

@@ -0,0 +1,12 @@
plugins {
id "java-library"
}
java {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}
dependencies {
implementation libs.dnsjava
}

View File

@@ -1,6 +1,5 @@
package org.signal; package org.signal.buildtools;
import org.gradle.internal.impldep.org.eclipse.jgit.annotations.NonNull;
import org.xbill.DNS.ARecord; import org.xbill.DNS.ARecord;
import org.xbill.DNS.Lookup; import org.xbill.DNS.Lookup;
import org.xbill.DNS.Record; import org.xbill.DNS.Record;
@@ -68,7 +67,7 @@ public final class StaticIpResolver {
} }
} }
private static @NonNull Lookup doLookup(@NonNull String hostname) throws UnknownHostException { private static Lookup doLookup(String hostname) throws UnknownHostException {
try { try {
return new Lookup(hostname); return new Lookup(hostname);
} catch (Throwable e) { } catch (Throwable e) {

View File

@@ -1,10 +0,0 @@
apply plugin: 'java-gradle-plugin'
repositories {
google()
mavenCentral()
}
dependencies {
implementation libs.dnsjava
}

View File

@@ -1,2 +0,0 @@
enableFeaturePreview('VERSION_CATALOGS')
apply from: '../dependencies.gradle'