diff --git a/settings.gradle b/settings.gradle index d039cc52..797bd488 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,5 +1,3 @@ -enableFeaturePreview("VERSION_CATALOGS") - dependencyResolutionManagement { repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) repositories { @@ -11,76 +9,76 @@ dependencyResolutionManagement { versionCatalogs { libs { - alias('nordic-ble-common').to('no.nordicsemi.android:ble-common:2.4.0.beta02') - alias('nordic-ble-ktx').to('no.nordicsemi.android:ble-ktx:2.4.0-beta01') - alias('nordic-scanner').to('no.nordicsemi.android.support.v18:scanner:1.6.0') - alias('nordic-dfu').to('no.nordicsemi.android:dfu:1.12.1-beta01') + library('nordic-ble-common', 'no.nordicsemi.android:ble-common:2.4.0.beta02') + library('nordic-ble-ktx', 'no.nordicsemi.android:ble-ktx:2.4.0-beta01') + library('nordic-scanner', 'no.nordicsemi.android.support.v18:scanner:1.6.0') + library('nordic-dfu', 'no.nordicsemi.android:dfu:1.12.1-beta01') - alias('nordic-log').to('no.nordicsemi.android:log-timber:2.3.0') - alias('timber-main').to('com.jakewharton.timber:timber:5.0.1') - alias('timber-arcao').to('com.arcao:slf4j-timber:3.1') + library('nordic-log', 'no.nordicsemi.android:log-timber:2.3.0') + library('timber-main', 'com.jakewharton.timber:timber:5.0.1') + library('timber-arcao', 'com.arcao:slf4j-timber:3.1') bundle('icons', ['nordic-log', 'timber-main', 'timber-arcao']) version('commonlibraries', '1.0.2') - alias('nordic-ui-scanner').to('no.nordicsemi.android.common', 'uiscanner').versionRef('commonlibraries') - alias('nordic-navigation').to('no.nordicsemi.android.common', 'navigation').versionRef('commonlibraries') - alias('nordic-theme').to('no.nordicsemi.android.common', 'theme').versionRef('commonlibraries') + library('nordic-ui-scanner', 'no.nordicsemi.android.common', 'uiscanner').versionRef('commonlibraries') + library('nordic-navigation', 'no.nordicsemi.android.common', 'navigation').versionRef('commonlibraries') + library('nordic-theme', 'no.nordicsemi.android.common', 'theme').versionRef('commonlibraries') - alias('localbroadcastmanager').to('androidx.localbroadcastmanager:localbroadcastmanager:1.1.0') - alias('material').to('com.google.android.material:material:1.6.0-alpha02') + library('localbroadcastmanager', 'androidx.localbroadcastmanager:localbroadcastmanager:1.1.0') + library('material', 'com.google.android.material:material:1.6.0-alpha02') version('lifecycle', '2.4.1') - alias('lifecycle-activity').to('androidx.lifecycle', 'lifecycle-runtime-ktx').versionRef('lifecycle') - alias('lifecycle-service').to('androidx.lifecycle', 'lifecycle-service').versionRef('lifecycle') - alias('compose-lifecycle').to('androidx.lifecycle', 'lifecycle-viewmodel-compose').versionRef('lifecycle') + library('lifecycle-activity', 'androidx.lifecycle', 'lifecycle-runtime-ktx').versionRef('lifecycle') + library('lifecycle-service', 'androidx.lifecycle', 'lifecycle-service').versionRef('lifecycle') + library('compose-lifecycle', 'androidx.lifecycle', 'lifecycle-viewmodel-compose').versionRef('lifecycle') - alias('androidx-core').to('androidx.core:core-ktx:1.7.0') - alias('compose-activity').to('androidx.activity:activity-compose:1.4.0') + library('androidx-core', 'androidx.core:core-ktx:1.7.0') + library('compose-activity', 'androidx.activity:activity-compose:1.4.0') version('datastore', '1.0.0') - alias('datastore-core').to('androidx.datastore', 'datastore').versionRef('datastore') - alias('datastore-prefs').to('androidx.datastore', 'datastore-preferences').versionRef('datastore') - alias('datastore-protobuf').to('com.google.protobuf:protobuf-javalite:3.18.0') + library('datastore-core', 'androidx.datastore', 'datastore').versionRef('datastore') + library('datastore-prefs', 'androidx.datastore', 'datastore-preferences').versionRef('datastore') + library('datastore-protobuf', 'com.google.protobuf:protobuf-javalite:3.18.0') bundle('datastore', ['datastore-core', 'datastore-prefs', 'datastore-protobuf']) version('compose', '1.1.0') - alias('compose-ui').to('androidx.compose.ui', 'ui').versionRef('compose') - alias('compose-material').to('androidx.compose.material3:material3:1.0.0-alpha05') - alias('compose-tooling-preview').to('androidx.compose.ui', 'ui-tooling-preview').versionRef('compose') - alias('compose-navigation').to('androidx.navigation:navigation-compose:2.4.1') + library('compose-ui', 'androidx.compose.ui', 'ui').versionRef('compose') + library('compose-material', 'androidx.compose.material3:material3:1.0.0-alpha05') + library('compose-tooling-preview', 'androidx.compose.ui', 'ui-tooling-preview').versionRef('compose') + library('compose-navigation', 'androidx.navigation:navigation-compose:2.4.1') bundle('compose', ['compose-ui', 'compose-material', 'compose-tooling-preview', 'compose-navigation']) - alias('material-icons').to('androidx.compose.material', 'material-icons-core').versionRef('compose') - alias('material-icons-extended').to('androidx.compose.material', 'material-icons-extended').versionRef('compose') + library('material-icons', 'androidx.compose.material', 'material-icons-core').versionRef('compose') + library('material-icons-extended', 'androidx.compose.material', 'material-icons-extended').versionRef('compose') bundle('icons', ['material-icons', 'material-icons-extended']) - alias('hilt-android').to('com.google.dagger:hilt-android:2.40.4') - alias('hilt-compiler').to('com.google.dagger:hilt-compiler:2.40.4') - alias('hilt-compose').to('androidx.hilt:hilt-navigation-compose:1.0.0') - alias('hilt-lifecycle').to('androidx.hilt:hilt-lifecycle-viewmodel:1.0.0-alpha03') - alias('hilt-lifecyclecompiler').to('androidx.hilt:hilt-compiler:1.0.0') + library('hilt-android', 'com.google.dagger:hilt-android:2.40.4') + library('hilt-compiler', 'com.google.dagger:hilt-compiler:2.40.4') + library('hilt-compose', 'androidx.hilt:hilt-navigation-compose:1.0.0') + library('hilt-lifecycle', 'androidx.hilt:hilt-lifecycle-viewmodel:1.0.0-alpha03') + library('hilt-lifecyclecompiler', 'androidx.hilt:hilt-compiler:1.0.0') bundle('hilt', ['hilt-android', 'hilt-compose', 'hilt-lifecycle']) bundle('hiltkapt', ['hilt-compiler', 'hilt-lifecyclecompiler']) - alias('kotlin-coroutines').to('org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.0') - alias('google-permissions').to('com.google.accompanist:accompanist-permissions:0.20.0') - alias('chart').to('com.github.PhilJay:MPAndroidChart:v3.1.0') + library('kotlin-coroutines', 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.0') + library('google-permissions', 'com.google.accompanist:accompanist-permissions:0.20.0') + library('chart', 'com.github.PhilJay:MPAndroidChart:v3.1.0') version('room', '2.4.1') - alias('room-runtime').to('androidx.room', 'room-runtime').versionRef('room') - alias('room-ktx').to('androidx.room', 'room-ktx').versionRef('room') - alias('room-compiler').to('androidx.room', 'room-compiler').versionRef('room') + library('room-runtime', 'androidx.room', 'room-runtime').versionRef('room') + library('room-ktx', 'androidx.room', 'room-ktx').versionRef('room') + library('room-compiler', 'androidx.room', 'room-compiler').versionRef('room') //-- Test ------------------------------------------------------------------------------ - alias('test-junit').to('junit:junit:4.13.2') - alias('android-test-junit').to('androidx.test.ext:junit:1.1.3') - alias('android-test-espresso').to('androidx.test.espresso:espresso-core:3.4.0') - alias('android-test-compose-ui').to('androidx.compose.ui', 'ui-test-junit4').versionRef('compose') - alias('android-test-compose-tooling').to('androidx.compose.ui', 'ui-tooling').versionRef('compose') + library('test-junit', 'junit:junit:4.13.2') + library('android-test-junit', 'androidx.test.ext:junit:1.1.3') + library('android-test-espresso', 'androidx.test.espresso:espresso-core:3.4.0') + library('android-test-compose-ui', 'androidx.compose.ui', 'ui-test-junit4').versionRef('compose') + library('android-test-compose-tooling', 'androidx.compose.ui', 'ui-tooling').versionRef('compose') - alias('mockk-main').to('io.mockk:mockk:1.12.2') - alias('mockk-jvm').to('io.mockk:mockk-agent-jvm:1.12.2') - alias('test-coroutines').to('org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.0') + library('mockk-main', 'io.mockk:mockk:1.12.2') + library('mockk-jvm', 'io.mockk:mockk-agent-jvm:1.12.2') + library('test-coroutines', 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.0') bundle('test', ['test-junit', 'android-test-junit', 'mockk-main', 'mockk-jvm', 'test-coroutines']) } }