move aar to :libraries module

This commit is contained in:
Milos Kozak 2022-10-27 16:42:09 +02:00
parent 34191a2668
commit 719ab09940
27 changed files with 89 additions and 24 deletions

View file

@ -171,10 +171,8 @@ dependencies {
// in order to use internet's versions you'd need to enable Jetifier again
// https://github.com/nightscout/graphview.git
implementation(files("${rootProject.rootDir}/libs/graphview.aar"))
// https://github.com/nightscout/iconify.git
implementation(files("${rootProject.rootDir}/libs/iconify.aar"))
implementation project(':libraries')
implementation project(':shared')
implementation project(':core')
implementation project(':automation')

View file

@ -13,8 +13,7 @@ android {
}
dependencies {
implementation(files("${rootProject.rootDir}/libs/graphview.aar"))
implementation project(':libraries')
implementation project(':core')
implementation project(':database')
implementation project(':shared')

View file

@ -13,8 +13,7 @@ android {
}
dependencies {
implementation(files("${rootProject.rootDir}/libs/iconify.aar"))
implementation project(':libraries')
implementation project(':core')
implementation project(':shared')
}

View file

@ -12,8 +12,7 @@ apply from: "${project.rootDir}/core/test_dependencies.gradle"
apply from: "${project.rootDir}/core/jacoco_global.gradle"
dependencies {
implementation(files("${rootProject.rootDir}/libs/graphview.aar"))
implementation project(':libraries')
implementation project(':shared')
implementation project(':database')
}

View file

@ -23,8 +23,7 @@ android {
}
dependencies {
implementation(files("${rootProject.rootDir}/libs/iconify.aar"))
implementation project(':libraries')
implementation project(':core')
implementation project(':shared')

View file

@ -23,8 +23,7 @@ android {
}
dependencies {
implementation(files("${rootProject.rootDir}/libs/iconify.aar"))
implementation project(':libraries')
implementation project(':core')
implementation project(':shared')

1
libraries/.gitignore vendored Normal file
View file

@ -0,0 +1 @@
/build

6
libraries/build.gradle Normal file
View file

@ -0,0 +1,6 @@
// in order to use internet's versions you'd need to enable Jetifier again
// https://github.com/nightscout/graphview.git
// https://github.com/nightscout/iconify.git
configurations.create("default")
artifacts.add("default", file('libs/graphview.aar'))
artifacts.add("default", file('libs/iconify.aar'))

View file

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

21
libraries/proguard-rules.pro vendored Normal file
View file

@ -0,0 +1,21 @@
# Add project specific ProGuard rules here.
# You can control the set of applied configuration files using the
# proguardFiles setting in build.gradle.
#
# For more details, see
# http://developer.android.com/guide/developing/tools/proguard.html
# If your project uses WebView with JS, uncomment the following
# and specify the fully qualified class name to the JavaScript interface
# class:
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
# public *;
#}
# Uncomment this to preserve the line number information for
# debugging stack traces.
#-keepattributes SourceFile,LineNumberTable
# If you keep the line number information, uncomment this to
# hide the original source file name.
#-renamesourcefileattribute SourceFile

View file

@ -0,0 +1,25 @@
package info.nightscout.libraries
import androidx.test.platform.app.InstrumentationRegistry
import androidx.test.ext.junit.runners.AndroidJUnit4
import org.junit.Test
import org.junit.runner.RunWith
import org.junit.Assert.*
/**
* Instrumented test, which will execute on an Android device.
*
* See [testing documentation](http://d.android.com/tools/testing).
*/
@RunWith(AndroidJUnit4::class)
class ExampleInstrumentedTest {
@Test
fun useAppContext() {
// Context of the app under test.
val appContext = InstrumentationRegistry.getInstrumentation().targetContext
assertEquals("info.nightscout.libraries.test", appContext.packageName)
}
}

View file

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
</manifest>

View file

@ -0,0 +1,18 @@
package info.nightscout.libraries
import org.junit.Test
import org.junit.Assert.*
/**
* Example local unit test, which will execute on the development machine (host).
*
* See [testing documentation](http://d.android.com/tools/testing).
*/
class ExampleUnitTest {
@Test
fun addition_isCorrect() {
assertEquals(4, 2 + 2)
}
}

View file

@ -13,8 +13,7 @@ android {
}
dependencies {
implementation(files("${rootProject.rootDir}/libs/iconify.aar"))
implementation project(':libraries')
implementation project(':core')
implementation project(':pump-common')
implementation project(':rileylink')

View file

@ -14,8 +14,7 @@ android {
}
dependencies {
implementation(files("${rootProject.rootDir}/libs/iconify.aar"))
implementation project(':libraries')
implementation project(':core')
implementation project(':shared')
}

View file

@ -30,8 +30,7 @@ android {
}
dependencies {
implementation(files("${rootProject.rootDir}/libs/iconify.aar"))
implementation project(':libraries')
implementation project(':core')
implementation project(':pump-common')
implementation project(':omnipod-common')

View file

@ -23,8 +23,7 @@ android {
}
dependencies {
implementation(files("${rootProject.rootDir}/libs/iconify.aar"))
implementation project(':libraries')
implementation project(':core')
implementation project(':pump-common')
implementation project(':omnipod-common')

View file

@ -17,3 +17,4 @@ include ':omnipod-dash'
include ':diaconn'
include ':openhumans'
include ':shared'
include ':libraries'

View file

@ -107,8 +107,8 @@ dependencies {
compileOnly "com.google.android.wearable:wearable:$wearable_version"
implementation "com.google.android.support:wearable:$wearable_version"
implementation "com.google.android.gms:play-services-wearable:$play_services_wearable_version"
implementation(files("${rootProject.rootDir}/libs/ustwo-clockwise-debug.aar"))
implementation(files("${rootProject.rootDir}/libs/wearpreferenceactivity-0.5.0.aar"))
implementation(files("${rootProject.rootDir}/libraries/libs/ustwo-clockwise-debug.aar"))
implementation(files("${rootProject.rootDir}/libraries/libs/wearpreferenceactivity-0.5.0.aar"))
implementation('com.github.lecho:hellocharts-library:1.5.8@aar')
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version"