Skip to content

Commit 939ec3e

Browse files
authored
Merge pull request #16 from sheyon/beta-1
v.1.8.1
2 parents 60dac4f + a334924 commit 939ec3e

9 files changed

Lines changed: 42 additions & 47 deletions

File tree

.idea/compiler.xml

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

.idea/gradle.xml

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

.idea/misc.xml

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

.idea/modules.xml

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

app/build.gradle

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
apply plugin: 'com.android.application'
22

33
android {
4-
compileSdkVersion 29
5-
buildToolsVersion '29.0.2'
4+
compileSdkVersion 33
5+
buildToolsVersion '30.0.3'
66
defaultConfig {
77
applicationId "com.sheyon.fivecats.legendslibrary"
8-
compileSdkVersion 29
8+
compileSdkVersion 33
99
multiDexEnabled true
10-
versionCode 14
11-
versionName '1.7.4'
10+
versionCode 16 // Increment this for next release
11+
versionName '1.8.1'
1212
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
13+
targetSdkVersion 33
1314
}
1415
lintOptions {
1516
disable 'MissingTranslation'
@@ -26,7 +27,7 @@ android {
2627
sdk19 {
2728
dimension 'api'
2829
minSdkVersion 19
29-
targetSdkVersion 29
30+
targetSdkVersion 33
3031
versionCode 1900 + android.defaultConfig.versionCode
3132
}
3233
sdk16 {
@@ -53,13 +54,13 @@ repositories {
5354

5455
dependencies {
5556
implementation fileTree(include: ['*.jar'], dir: 'libs')
56-
androidTestImplementation('androidx.test.espresso:espresso-core:3.2.0', {
57+
androidTestImplementation('androidx.test.espresso:espresso-core:3.5.0', {
5758
exclude group: 'com.android.support', module: 'support-annotations'
5859
})
59-
implementation 'androidx.appcompat:appcompat:1.1.0'
60+
implementation 'androidx.appcompat:appcompat:1.5.1'
6061
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
6162
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
62-
implementation 'com.google.android.material:material:1.0.0'
63+
implementation 'com.google.android.material:material:1.6.0'
6364
implementation 'com.sbrukhanda.fragmentviewpager:fragmentviewpager:1.0.0'
6465
implementation 'com.android.support:multidex:1.0.3'
6566
sdk19Implementation 'com.github.ranaparamveer:android-sqlite-asset-helper:v2.0.7'

app/src/main/AndroidManifest.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@
1313
tools:ignore="GoogleAppIndexingWarning">
1414
<activity
1515
android:name=".MainActivity"
16-
android:launchMode="singleTask">
16+
android:launchMode="singleTask"
17+
android:exported="true">
1718
<intent-filter>
1819
<action android:name="android.intent.action.MAIN" />
1920
<category android:name="android.intent.category.LAUNCHER" />

app/src/main/java/com/sheyon/fivecats/legendslibrary/data/LegendsDatabase.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ public synchronized static void initiateUpgrade(Context context, LegendsPreferen
156156
//AssetHelper AUTOMATICALLY INCREMENTS THE DATABASE IF VERSIONS DO NOT MATCH, UNDO THAT CHANGE SO THE DATABASE CAN FORCE UPGRADE
157157
db.setVersion(LegendsConstants.DATABASE_VERSION - 1);
158158
upgradeHelper[0].setForcedUpgrade(LegendsConstants.DATABASE_VERSION);
159-
db.close();
159+
//db.close();
160160

161161
db = upgradeHelper[0].getWritableDatabase();
162162
if (!oldFavorites.isEmpty()) {

build.gradle

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ buildscript {
66
google()
77
}
88
dependencies {
9-
classpath 'com.android.tools.build:gradle:3.5.2'
9+
classpath 'com.android.tools.build:gradle:4.1.3'
1010
// NOTE: Do not place your application dependencies here; they belong
1111
// in the individual module build.gradle files
1212
}
@@ -18,8 +18,4 @@ allprojects {
1818
google()
1919
maven { url 'https://jitpack.io' }
2020
}
21-
}
22-
23-
task clean(type: Delete) {
24-
delete rootProject.buildDir
2521
}
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Thu Sep 27 13:29:42 EDT 2018
1+
#Fri Dec 23 10:11:22 EST 2022
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip

0 commit comments

Comments
 (0)