Skip to content
Open
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
17 changes: 2 additions & 15 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,33 +3,21 @@ plugins {
id 'kotlin-android'
id 'kotlin-kapt'
id 'org.jetbrains.kotlin.plugin.serialization' version '1.4.30'
id 'dk.nstack.translation.plugin'
id 'dagger.hilt.android.plugin'
}

translation {
appId = keys.appId
apiKey = keys.apiKey
acceptHeader = keys.acceptHeader
}

android {
compileSdkVersion 32
compileSdkVersion 33
buildToolsVersion "30.0.3"
flavorDimensions "default"

defaultConfig {
applicationId "com.monstarlab"
minSdkVersion 23
targetSdkVersion 32
targetSdkVersion 33
versionCode 1
versionName "1.0"

manifestPlaceholders = [
appId : keys.appId,
apiKey: keys.apiKey
]

testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
buildFeatures {
Expand Down Expand Up @@ -120,7 +108,6 @@ dependencies {

implementation("androidx.datastore:datastore-preferences:${versions.datastore}")

implementation "dk.nodes.nstack:nstack-kotlin:${versions.nodes_nstack_kotlin}"
implementation "com.jakewharton.timber:timber:${versions.timber}"

}
16 changes: 0 additions & 16 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,22 +23,6 @@
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>

<!-- nstack app id and key from build.gradle manifest placeholder -->
<meta-data
android:name="dk.nodes.nstack.appId"
android:value="${appId}"
tools:replace="android:value" />
<meta-data
android:name="dk.nodes.nstack.apiKey"
android:value="${apiKey}"
tools:replace="android:value" />

<meta-data
android:name="dk.nodes.nstack.env"
android:value="${env}"
tools:replace="android:value" />

</application>

</manifest>
4 changes: 0 additions & 4 deletions app/src/main/java/com/monstarlab/App.kt
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@ package com.monstarlab

import android.annotation.SuppressLint
import android.app.Application
import com.monstarlab.features.nstack.Translation
import dagger.hilt.android.HiltAndroidApp
import dk.nodes.nstack.kotlin.NStack
import timber.log.Timber

@HiltAndroidApp
Expand All @@ -13,8 +11,6 @@ class App : Application() {
@SuppressLint("AppOpenMissing")
override fun onCreate() {
super.onCreate()
NStack.translationClass = Translation::class.java
NStack.init(this, BuildConfig.DEBUG)
if (BuildConfig.DEBUG) {
Timber.plant(Timber.DebugTree())
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,5 @@ import dagger.hilt.android.AndroidEntryPoint
class MainActivity : AppCompatActivity(R.layout.activity_main) {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setupNStack()
}
}
139 changes: 0 additions & 139 deletions app/src/main/java/com/monstarlab/features/main/setupNStack.kt

This file was deleted.

This file was deleted.

62 changes: 0 additions & 62 deletions app/src/main/java/com/monstarlab/features/nstack/Translation.java

This file was deleted.

27 changes: 10 additions & 17 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ buildscript {

ext.versions = [
kotlin_plugin : '1.6.21',
kotlin : '1.6.21',
appcompat : '1.4.1',
coroutines : '1.6.1',
kotlin : '1.7.10',
appcompat : '1.5.1',
coroutines : '1.6.2',
json : '1.0.1',
constraint_layout : '2.1.3',
hilt : '2.40.5',
lifecycle : '2.4.1',
constraint_layout : '2.1.4',
hilt : '2.42',
lifecycle : '2.5.1',
timber : "5.0.1",
junit : '4.13.2',
junit_ext : '1.1.3',
Expand All @@ -20,11 +20,11 @@ buildscript {
retrofit : '2.9.0',
retrofit_converter : '0.8.0',
okhttp : '4.9.1',
ktx_core : '1.7.0',
ktx_core : '1.9.0',
ktx : '1.7.0',
material : '1.6.0',
material : '1.6.1',
archCore : '2.1.0',
navigation : '2.4.2',
navigation : '2.5.2',
nodes_utils : '1.0.0',
nodes_utils_okhttp : '0.12.2',
preferences : '1.1.1',
Expand All @@ -36,20 +36,13 @@ buildscript {
datastore : '1.0.0',
]

ext.keys = [
appId : 'IXmpT4N7MJbGEXvDfGqGH4UKHrmV0EOqFeK0',
apiKey : 'LqWLm621BwIxNRzdrei88pKhIIEI2EE8ni8r',
acceptHeader: "en-GB"
]

repositories {
google()
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:7.2.0'
classpath 'com.android.tools.build:gradle:7.2.2'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin_plugin}"
classpath "dk.nodes.nstack:translation:${versions.nstack_gradle_plugin}"
classpath "com.google.dagger:hilt-android-gradle-plugin:${versions.hilt}"
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
Expand Down