Skip to content

Commit 531908c

Browse files
some changes
1 parent 8bc80a7 commit 531908c

File tree

7 files changed

+19
-57
lines changed

7 files changed

+19
-57
lines changed

.idea/modules.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/build.gradle

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,25 +16,28 @@ android {
1616
}
1717

1818
signingConfigs {
19+
debug {
20+
keyAlias 'PublicKey'
21+
keyPassword '12344321'
22+
storeFile file('../keyStorePublic.jks')
23+
storePassword '12344321'
24+
}
1925
release {
2026
keyAlias 'PublicKey'
2127
keyPassword '12344321'
22-
storeFile file('C:/Users/Taqtile/StudioProjects/keyStorePublic.jks')
28+
storeFile file('../keyStorePublic.jks')
2329
storePassword '12344321'
2430
}
2531
}
2632

2733
buildTypes {
2834
debug {
29-
// Disable fabric build ID generation for debug builds
3035
ext.enableCrashlytics = false
36+
signingConfig signingConfigs.debug
3137
}
3238
release {
3339
// shrinkResources true
3440
// minifyEnabled true
35-
// crashlytics {
36-
// ext.betaDistributionApkFilePath = 'C:/Users/Taqtile/.jenkins/workspace/Notes/app/build/app-release.apk'
37-
// }
3841
ext.enableCrashlytics = true
3942
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
4043
signingConfig signingConfigs.release
@@ -47,17 +50,17 @@ repositories {
4750
}
4851

4952
def dbflow_version = "4.0.3"
50-
def support_version = "27.1.0"
53+
def support_version = "27.1.1"
5154

5255
dependencies {
5356
implementation fileTree(include: ['*.jar'], dir: 'libs')
54-
implementation "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
57+
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
5558
implementation "com.android.support:appcompat-v7:${support_version}"
5659
implementation "com.android.support:design:${support_version}"
5760
implementation "com.android.support:recyclerview-v7:${support_version}"
5861
implementation "com.android.support:cardview-v7:${support_version}"
5962
implementation "com.android.support:support-v4:${support_version}"
60-
implementation 'com.android.support.constraint:constraint-layout:1.0.2'
63+
implementation 'com.android.support.constraint:constraint-layout:1.1.1'
6164
kapt "com.github.Raizlabs.DBFlow:dbflow-processor:${dbflow_version}"
6265
implementation "com.github.Raizlabs.DBFlow:dbflow-core:${dbflow_version}"
6366
implementation "com.github.Raizlabs.DBFlow:dbflow:${dbflow_version}"
@@ -68,8 +71,8 @@ dependencies {
6871
implementation('com.crashlytics.sdk.android:crashlytics:2.9.1@aar') {
6972
transitive = true
7073
}
71-
implementation 'com.squareup.picasso:picasso:2.5.2'
74+
implementation 'com.squareup.picasso:picasso:2.71828'
7275
testImplementation 'junit:junit:4.12'
73-
androidTestImplementation 'com.android.support.test:runner:1.0.1'
74-
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
76+
androidTestImplementation 'com.android.support.test:runner:1.0.2'
77+
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
7578
}

app/src/androidTest/java/com/dev/pavelharetskiy/notes_kotlin/ExampleInstrumentedTest.kt

Lines changed: 0 additions & 24 deletions
This file was deleted.

app/src/main/java/com/dev/pavelharetskiy/notes_kotlin/views/NotesHolder.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ class NotesHolder(private val cardView: CardView, val context: Context) : Recycl
5252
}
5353
}
5454

55-
Picasso.with(context)
55+
Picasso.get()
5656
.load(uri)
5757
.placeholder(R.drawable.no_photo)
5858
.resize(256, 256)

app/src/test/java/com/dev/pavelharetskiy/notes_kotlin/ExampleUnitTest.kt

Lines changed: 0 additions & 17 deletions
This file was deleted.

build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22

33
buildscript {
4-
ext.kotlin_version = '1.2.31'
4+
ext.kotlin_version = '1.2.50'
55
repositories {
66
mavenCentral()
77
google()
@@ -10,8 +10,8 @@ buildscript {
1010
maven { url 'https://maven.fabric.io/public' }
1111
}
1212
dependencies {
13-
classpath 'com.android.tools.build:gradle:3.1.0'
14-
classpath 'io.fabric.tools:gradle:1.+'
13+
classpath 'com.android.tools.build:gradle:3.1.3'
14+
classpath 'io.fabric.tools:gradle:1.25.4'
1515
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1616
}
1717
}

keyStorePublic.jks

4.09 KB
Binary file not shown.

0 commit comments

Comments
 (0)