diff --git a/app/build.gradle b/app/build.gradle index b6640bfa..5b656d80 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,28 +1,36 @@ apply plugin: 'com.android.application' -apply plugin: 'android-apt' android { - compileSdkVersion 25 - buildToolsVersion '25.0.3' + compileSdkVersion 28 + buildToolsVersion '28.0.3' useLibrary 'org.apache.http.legacy' defaultConfig { minSdkVersion 15 - targetSdkVersion 25 + targetSdkVersion 28 versionCode 230 versionName '2.5.10' + + javaCompileOptions { + annotationProcessorOptions { + arguments = ["resourcePackageName": "org.transdroid"] + } + } } buildTypes { release { minifyEnabled false } } + flavorDimensions "version" productFlavors { full { + dimension "version" applicationId 'org.transdroid.full' resValue "string", "search_history_authority", applicationId + ".search.SearchHistoryProvider" } lite { + dimension "version" applicationId 'org.transdroid.lite' resValue "string", "search_history_authority", applicationId + ".search.SearchHistoryProvider" } @@ -33,26 +41,20 @@ android { } dependencies { - compile 'org.androidannotations:androidannotations-api:3.3.2' - compile 'com.j256.ormlite:ormlite-core:4.48' - compile 'com.j256.ormlite:ormlite-android:4.48' - compile 'com.nostra13.universalimageloader:universal-image-loader:1.9.5' - compile 'com.android.support:appcompat-v7:23.4.0' - compile 'com.android.support:support-annotations:23.4.0' - compile 'com.getbase:floatingactionbutton:1.10.1' - compile 'com.nispok:snackbar:2.11.0' - compile 'com.github.aegnor:rencode-java:cb628e824e' - compile('com.github.afollestad.material-dialogs:core:0.8.5.5@aar') { + implementation 'org.androidannotations:androidannotations-api:4.4.0' + implementation 'org.androidannotations:ormlite-api:4.4.0' + implementation 'com.j256.ormlite:ormlite-core:4.48' + implementation 'com.j256.ormlite:ormlite-android:4.48' + implementation 'com.nostra13.universalimageloader:universal-image-loader:1.9.5' + implementation 'com.android.support:appcompat-v7:28.0.0' + implementation 'com.android.support:support-annotations:28.0.0' + implementation 'com.getbase:floatingactionbutton:1.10.1' + implementation 'com.nispok:snackbar:2.11.0' + implementation 'com.github.aegnor:rencode-java:cb628e824e' + implementation('com.github.afollestad.material-dialogs:core:0.9.6.0@aar') { transitive = true } - apt 'org.androidannotations:androidannotations:3.3.2' + annotationProcessor 'org.androidannotations:androidannotations:4.4.0' + annotationProcessor 'org.androidannotations:ormlite:4.4.0' } -apt { - arguments { - androidManifestFile variant.outputs[0].processResources.manifestFile - resourcePackageName 'org.transdroid' - //logLevel 'INFO' - //logFile '/Users/erickok/Dev/transdroid/transdroid/app/build/aa-log.txt' - } -} diff --git a/app/src/main/java/org/transdroid/core/gui/log/ErrorLogSender.java b/app/src/main/java/org/transdroid/core/gui/log/ErrorLogSender.java index d6e22b63..e4b68fed 100644 --- a/app/src/main/java/org/transdroid/core/gui/log/ErrorLogSender.java +++ b/app/src/main/java/org/transdroid/core/gui/log/ErrorLogSender.java @@ -21,7 +21,7 @@ import java.util.List; import org.androidannotations.annotations.Bean; import org.androidannotations.annotations.EBean; -import org.androidannotations.annotations.OrmLiteDao; +import org.androidannotations.ormlite.annotations.OrmLiteDao; import org.transdroid.R; import org.transdroid.core.app.settings.ServerSetting; import org.transdroid.core.gui.navigation.NavigationHelper; @@ -39,7 +39,7 @@ public class ErrorLogSender { protected Log log; @Bean protected NavigationHelper navigationHelper; - @OrmLiteDao(helper = DatabaseHelper.class, model = ErrorLogEntry.class) + @OrmLiteDao(helper = DatabaseHelper.class) protected Dao errorLogDao; public void collectAndSendLog(final Activity callingActivity, final ServerSetting serverSetting) { diff --git a/app/src/main/java/org/transdroid/core/gui/log/Log.java b/app/src/main/java/org/transdroid/core/gui/log/Log.java index 346bf17f..786a679a 100644 --- a/app/src/main/java/org/transdroid/core/gui/log/Log.java +++ b/app/src/main/java/org/transdroid/core/gui/log/Log.java @@ -21,7 +21,7 @@ import com.j256.ormlite.stmt.DeleteBuilder; import org.androidannotations.annotations.EBean; import org.androidannotations.annotations.EBean.Scope; -import org.androidannotations.annotations.OrmLiteDao; +import org.androidannotations.ormlite.annotations.OrmLiteDao; import org.transdroid.BuildConfig; import java.util.Date; @@ -35,7 +35,7 @@ public class Log { public static final String LOG_NAME = "Transdroid"; private static final long MAX_LOG_AGE = 15 * 60 * 1000; // 15 minutes - @OrmLiteDao(helper = DatabaseHelper.class, model = ErrorLogEntry.class) + @OrmLiteDao(helper = DatabaseHelper.class) Dao errorLogDao; protected void log(Object object, int priority, String message) { diff --git a/app/src/main/java/org/transdroid/core/gui/search/SearchActivity.java b/app/src/main/java/org/transdroid/core/gui/search/SearchActivity.java index d65f66ca..6c1fe0cb 100644 --- a/app/src/main/java/org/transdroid/core/gui/search/SearchActivity.java +++ b/app/src/main/java/org/transdroid/core/gui/search/SearchActivity.java @@ -98,7 +98,7 @@ public class SearchActivity extends AppCompatActivity { @AfterViews protected void init() { - searchToolbar.setNavigationIcon(R.drawable.abc_ic_ab_back_mtrl_am_alpha); + searchToolbar.setNavigationIcon(R.drawable.abc_ic_ab_back_material); searchToolbar.setNavigationOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { diff --git a/build.gradle b/build.gradle index 6944a5dc..4b97834d 100644 --- a/build.gradle +++ b/build.gradle @@ -1,15 +1,16 @@ buildscript { repositories { + google() jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.3.0' - classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8' + classpath 'com.android.tools.build:gradle:3.2.0' } } allprojects { repositories { + google() jcenter() mavenLocal() maven { url "https://jitpack.io" } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a7dfde21..4d492f3f 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ 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-4.10-all.zip