Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 16 additions & 13 deletions core/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,32 +1,35 @@
plugins {
id("dev.frozenmilk.android-library") version "10.3.0-0.1.4"
id("dev.frozenmilk.publish") version "0.0.4"
id("dev.frozenmilk.doc") version "0.0.4"
id("dev.frozenmilk.android-library") version "11.1.0-1.1.1"
id("dev.frozenmilk.publish") version "0.0.5"
id("dev.frozenmilk.doc") version "0.0.5"
}

android.namespace = "org.solverslib.core"

dairyPublishing {
gitDir = file("..")
}

ftc {
kotlin
kotlin()

sdk {
RobotCore {
configurationNames += "testImplementation"
}
FtcCommon
Hardware
implementation(RobotCore)
implementation(FtcCommon)
implementation(Hardware)

testImplementation(RobotCore)
}
}

dependencies {
implementation("org.ejml:ejml-simple:0.39") {
exclude(group = "org.ejml", module = "ejml-all")
}
//noinspection GradleDependency
implementation("androidx.core:core:1.2.0")
testImplementation("org.mockito:mockito-core:4.9.0")
}

dairyPublishing {
gitDir = file("..")
testImplementation("junit:junit:4.13.2")
}

publishing {
Expand Down
Empty file removed core/consumer-rules.pro
Empty file.
21 changes: 0 additions & 21 deletions core/proguard-rules.pro

This file was deleted.

26 changes: 14 additions & 12 deletions examples/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,21 +1,23 @@
plugins {
id("dev.frozenmilk.teamcode") version "10.3.0-0.1.4"
id("dev.frozenmilk.teamcode") version "11.1.0-1.1.1"
}

ftc {
kotlin
kotlin()

// note: sdk automatically added
}
sdk.TeamCode()

dependencies {
implementation("org.solverslib:core")
implementation("org.solverslib:pedroPathing")
solvers {
implementation(core(""))
implementation(pedroPathing(""))
}

implementation("com.pedropathing:ftc:2.0.3")
pedro {
implementation(ftc)
}
}

repositories {
maven("https://maven.brott.dev/")
maven("https://maven.pedropathing.com/")
}
// TODO: migrate once vision is published as part of easy auto libraries
dependencies {
implementation("org.solverslib:vision")
}
Empty file removed examples/consumer-rules.pro
Empty file.
21 changes: 0 additions & 21 deletions examples/proguard-rules.pro

This file was deleted.

6 changes: 6 additions & 0 deletions examples/settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,9 @@ includeBuild("../pedroPathing") {
substitute(module("org.solverslib:pedroPathing")).using(project(":"))
}
}

includeBuild("../vision") {
dependencySubstitution {
substitute(module("org.solverslib:vision")).using(project(":"))
}
}
43 changes: 21 additions & 22 deletions pedroPathing/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,40 +1,39 @@
plugins {
id("dev.frozenmilk.android-library") version "10.3.0-0.1.4"
id("dev.frozenmilk.publish") version "0.0.4"
id("dev.frozenmilk.doc") version "0.0.4"
id("dev.frozenmilk.android-library") version "11.1.0-1.1.1"
id("dev.frozenmilk.publish") version "0.0.5"
id("dev.frozenmilk.doc") version "0.0.5"
}

android.namespace = "org.solverslib.pedroPathing"

dairyPublishing {
gitDir = file("..")
}

ftc {
kotlin
kotlin()

sdk {
RobotCore {
configurationNames += "testImplementation"
}
FtcCommon
Hardware
}
}
implementation(RobotCore)
implementation(FtcCommon)
implementation(Hardware)

dependencies {
implementation("org.ejml:ejml-simple:0.39") {
exclude(group = "org.ejml", module = "ejml-all")
testImplementation(RobotCore)
}
implementation("com.pedropathing:ftc:2.0.4")

afterEvaluate {
api("org.solverslib:core:$version")
solvers {
api(core(dairyPublishing.version))
}
}

repositories {
maven("https://maven.brott.dev/")
pedro {
implementation(ftc)
}
}

dairyPublishing {
gitDir = file("..")
dependencies {
implementation("org.ejml:ejml-simple:0.39") {
exclude(group = "org.ejml", module = "ejml-all")
}
}

publishing {
Expand Down
Empty file removed pedroPathing/consumer-rules.pro
Empty file.
21 changes: 0 additions & 21 deletions pedroPathing/proguard-rules.pro

This file was deleted.

9 changes: 1 addition & 8 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,4 @@ pluginManagement {
}
}

includeBuild("../SolversLib/core") {
dependencySubstitution {
substitute(module("org.solverslib:core")).using(project(":"))
}
}

includeBuild("examples")
includeBuild("pedroPathing")
includeBuild("examples")
5 changes: 5 additions & 0 deletions vision/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
build/
../local.properties/
ReleaseStorage/
.settings/
vision/ReleaseStorage/
44 changes: 44 additions & 0 deletions vision/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
plugins {
id("dev.frozenmilk.android-library") version "11.1.0-1.1.1"
id("dev.frozenmilk.publish") version "0.0.5"
id("dev.frozenmilk.doc") version "0.0.5"
}

android.namespace = "org.solverslib.vision"

dairyPublishing {
gitDir = file("..")
}

ftc {
kotlin()

sdk {
implementation(RobotCore)
implementation(FtcCommon)
implementation(Hardware)
implementation(Vision)

testImplementation(RobotCore)
}

solvers {
api(core(dairyPublishing.version))
}
}

publishing {
publications {
register<MavenPublication>("release") {
groupId = "org.solverslib"
artifactId = "vision"

artifact(dairyDoc.dokkaHtmlJar)
artifact(dairyDoc.dokkaJavadocJar)

afterEvaluate {
from(components["release"])
}
}
}
}
15 changes: 15 additions & 0 deletions vision/gradle.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# AndroidX package structure to make it clearer which packages are bundled with the
# Android operating system, and which are packaged with your app's APK
# https://developer.android.com/topic/libraries/support-library/androidx-rn
android.useAndroidX=true

# We no longer need to auto-convert third-party libraries to use AndroidX, which slowed down the build
android.enableJetifier=false

# Allow Gradle to use up to 1 GB of RAM
org.gradle.jvmargs=-Xmx1024M

android.nonTransitiveRClass=false

org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled
org.jetbrains.dokka.experimental.gradle.pluginMode.noWarn=true
Binary file added vision/gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
5 changes: 5 additions & 0 deletions vision/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading