Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Migrate to androidX for fixing compile issues #28

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Migrate to androidX for fixing compile issues #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 13 additions & 9 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,11 @@

buildscript {
repositories {
google()
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:2.3.1'
classpath 'com.android.tools.build:gradle:4.0.0'
}
}

Expand Down Expand Up @@ -51,24 +52,27 @@ int getMyVersionCode() {
}

repositories {
google()
jcenter()
}

dependencies {
compile 'org.microg:unifiednlp-api:1.5.6'
compile 'org.microg:address-formatter:0.2.1'
compile 'com.takisoft.fix:preference-v7:25.3.1.0'
implementation 'org.microg:unifiednlp-api:1.5.6'
implementation 'org.microg:address-formatter:0.2.1'
//noinspection GradleCompatible,GradleCompatible
implementation 'androidx.appcompat:appcompat:1.0.0'
implementation 'com.takisoft.fix:preference-v7:25.3.1.0'
}

android {
compileSdkVersion 25
buildToolsVersion "25.0.2"
android {
compileSdkVersion 29
buildToolsVersion "29.0.3"

defaultConfig {
versionName getMyVersionName()
versionCode(20000 + getMyVersionCode())
minSdkVersion 9
targetSdkVersion 25
minSdkVersion 14
targetSdkVersion 29
}
}

Expand Down
2 changes: 2 additions & 0 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
android.enableJetifier=true
android.useAndroidX=true
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Tue Feb 12 23:24:00 UTC 2017
#Sun Sep 06 12:08:56 CEST 2020
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
6 changes: 3 additions & 3 deletions src/main/java/org/microg/nlp/backend/nominatim/SettingsActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

import android.content.SharedPreferences;
import android.os.Bundle;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.preference.ListPreference;
import android.support.v7.preference.Preference;
import androidx.appcompat.app.AppCompatActivity;
import androidx.preference.ListPreference;
import androidx.preference.Preference;

import com.takisoft.fix.support.v7.preference.PreferenceFragmentCompat;

Expand Down