Skip to content

Commit 29147ad

Browse files
authored
Merge pull request #43 from JLindemann42/development
2.2.0 Build 78
2 parents 1b47237 + 440c4d8 commit 29147ad

File tree

144 files changed

+4661
-1245
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

144 files changed

+4661
-1245
lines changed

.idea/deploymentTargetSelector.xml

Lines changed: 18 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/kotlinc.xml

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/migrations.xml

Lines changed: 10 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/other.xml

Lines changed: 263 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/runConfigurations.xml

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

app/build.gradle

Lines changed: 27 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,28 @@
1-
apply plugin: 'com.android.application'
2-
apply plugin: 'kotlin-android'
3-
apply plugin: 'kotlin-android-extensions'
4-
apply plugin: 'com.jakewharton.butterknife'
1+
2+
plugins {
3+
id 'com.android.application'
4+
id 'kotlin-android'
5+
id 'com.jakewharton.butterknife'
6+
id 'kotlin-parcelize'
7+
}
58

69
android {
710
signingConfigs {
811
config {
912
storeFile file('C:\\Users\\jonat\\OneDrive\\Skrivbord\\app\\science_keys.jks')
1013
}
1114
}
12-
compileSdkVersion 31
13-
buildToolsVersion "30.0.3"
15+
lint {
16+
baseline = file("lint-baseline.xml")
17+
}
18+
compileSdkVersion 34
19+
buildToolsVersion "34.0.0"
1420
defaultConfig {
1521
applicationId "com.jlindemann.science"
1622
minSdkVersion 23
17-
targetSdkVersion 30
18-
versionCode 61
19-
versionName "2.0.2"
23+
targetSdkVersion 34
24+
versionCode 78
25+
versionName "2.2.0"
2026
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
2127
}
2228
buildTypes {
@@ -43,13 +49,17 @@ android {
4349
buildFeatures {
4450
viewBinding true
4551
}
52+
53+
namespace 'com.jlindemann.science'
4654
}
4755

56+
57+
4858
dependencies {
4959
implementation fileTree(dir: 'libs', include: ['*.jar'])
5060
implementation"org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
5161
implementation 'androidx.appcompat:appcompat:1.3.1'
52-
implementation 'androidx.core:core-ktx:1.3.2'
62+
implementation 'androidx.core:core-ktx:1.13.1'
5363
implementation 'com.github.ultimate-deej:twowaynestedscrollview:0.1'
5464
implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
5565
implementation 'com.google.code.gson:gson:2.8.6'
@@ -63,13 +73,17 @@ dependencies {
6373
implementation 'com.beust:klaxon:5.0.1'
6474
implementation 'com.github.mmin18:realtimeblurview:1.2.1'
6575
implementation 'com.google.android.material:material:1.5.0-alpha04'
66-
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.7"
67-
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.4"
76+
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.1"
77+
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.1"
6878
implementation 'androidx.browser:browser:1.3.0'
6979
implementation 'com.ernestoyaquello.dragdropswiperecyclerview:drag-drop-swipe-recyclerview:1.0.2'
7080
implementation 'com.otaliastudios:zoomlayout:1.8.0'
7181
testImplementation 'junit:junit:4.12'
7282
androidTestImplementation 'androidx.test:runner:1.3.0'
73-
androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
83+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.0'
7484
annotationProcessor 'com.jakewharton:butterknife-compiler:10.1.0'
85+
86+
def billing_version = "7.0.0"
87+
implementation "com.android.billingclient:billing-ktx:$billing_version"
88+
implementation 'com.google.firebase:firebase-crashlytics-buildtools:2.9.1'
7589
}

0 commit comments

Comments
 (0)