Skip to content

Commit

Permalink
dagger
Browse files Browse the repository at this point in the history
  • Loading branch information
skyfion committed Nov 27, 2018
1 parent 018d3f3 commit 78194fc
Show file tree
Hide file tree
Showing 36 changed files with 941 additions and 318 deletions.
34 changes: 31 additions & 3 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ apply plugin: 'kotlin-android'

apply plugin: 'kotlin-android-extensions'

apply plugin: 'kotlin-kapt'

repositories {
maven {
url 'https://github.com/kshoji/USB-MIDI-Driver/raw/master/MIDIDriver/snapshots'
Expand All @@ -18,8 +20,8 @@ android {
applicationId "xyz.lazysoft.a3amp"
minSdkVersion 25
targetSdkVersion 27
versionCode 1
versionName "1.0"
versionCode 5
versionName "1.3"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
}
buildTypes {
Expand All @@ -30,21 +32,47 @@ android {
}
productFlavors {
}
testOptions {
unitTests.returnDefaultValues = true
unitTests.includeAndroidResources = true
}
kapt { generateStubs = true }
}

dependencies {
implementation fileTree(include: ['*.jar'], dir: 'libs')
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation 'com.android.support:appcompat-v7:27.1.1'

// def room_version = "2.1.0-alpha02"
// implementation "androidx.room:room-runtime:$room_version"
// annotationProcessor "androidx.room:room-compiler:$room_version" // use kapt for Kotlin
// kapt "androidx.room:room-compiler:$room_version"
implementation "android.arch.persistence.room:runtime:1.1.1"
kapt "android.arch.persistence.room:compiler:1.1.1"
// inject Dagger-Android
implementation 'com.google.dagger:dagger:2.15'
// annotationProcessor 'com.google.dagger:dagger-compiler:2.15'
implementation 'com.google.dagger:dagger-android:2.15'
implementation 'com.google.dagger:dagger-android-support:2.15'
kapt "com.google.dagger:dagger-compiler:2.15"
kapt "com.google.dagger:dagger-android-processor:2.15"
// Android KTX
// implementation 'androidx.core:core:1.0.1'

implementation 'com.android.support.constraint:constraint-layout:1.1.3'
implementation 'com.android.support:support-v4:27.1.1'
implementation 'com.google.android.gms:play-services-plus:16.0.0'
testImplementation 'junit:junit:4.12'
androidTestImplementation 'com.android.support.test:runner:1.0.2'
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
implementation 'jp.kshoji:midi-driver:0.1.4:@aar'
implementation 'com.android.support:design:27.1.1'
implementation 'com.github.BeppiMenozzi:Knob:1.9.0'
implementation 'com.google.android:flexbox:1.0.0'
implementation 'com.github.GoodieBag:CarouselPicker:v1.1'
testImplementation 'junit:junit:4.12'
// Optional -- Robolectric environment
testImplementation 'androidx.test:core:1.0.0'
// Optional -- Mockito framework
testImplementation 'org.mockito:mockito-core:1.10.19'
}
21 changes: 18 additions & 3 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,38 @@
package="xyz.lazysoft.a3amp">

<uses-feature android:name="android.hardware.usb.host" />
<uses-feature android:name="android.software.midi" android:required="true"/>

<!-- To access Google+ APIs: -->
<uses-permission android:name="android.permission.INTERNET" />
<!--<uses-permission android:name="android.permission.INTERNET" />-->
<uses-permission android:name="android.permission.MANAGE_DOCUMENTS"
tools:ignore="ProtectedPermissions" />

<application
android:name=".base.App"
android:allowBackup="true"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/AppTheme">
android:theme="@style/AppTheme"
tools:ignore="GoogleAppIndexingWarning"
android:fullBackupContent="@xml/backup_descriptor">
<!--<provider-->
<!--android:name="xyz.lazysoft.a3amp.components.FileService"-->
<!--android:authorities="xyz.lazysoft.a3amp.components.fileservice"-->
<!--android:exported="true"-->
<!--android:grantUriPermissions="true"-->
<!--android:permission="android.permission.MANAGE_DOCUMENTS">-->
<!--<intent-filter>-->
<!--<action android:name="android.content.action.DOCUMENTS_PROVIDER" />-->
<!--</intent-filter>-->
<!--</provider>-->
<activity
android:name=".MainActivity"
android:launchMode="singleTask">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
Expand Down
Loading

0 comments on commit 78194fc

Please sign in to comment.