Clean up Gradle build files (#778)

* clean up various Gradle-related things

* re-enable ktlint

Author: bartekpacia

.github/workflows/prepare.yaml

@@ -55,9 +55,9 @@ jobs:
         run: flutter test
 
       # disabled because always fails for strange reasons
-      # - name: ktlint check
-      #   working-directory: example/android
-      #   run: ./gradlew :flutter_downloader:ktlintCheck
+      - name: ktlint check
+        working-directory: example/android
+        run: ./gradlew flutter_downloader:ktlintCheck
 
       - name: flutter pub get (example app)
         working-directory: ./example

android/build.gradle

@@ -1,56 +1,47 @@
-group 'vn.hunghd.flutterdownloader'
-version '1.0-SNAPSHOT'
-
 buildscript {
-    ext.kotlin_version = '1.7.10'
+    ext.kotlin_version = "1.7.22"
     repositories {
         google()
         mavenCentral()
-        maven {
-            url "https://plugins.gradle.org/m2/"
-        }
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.2.2'
+        classpath "com.android.tools.build:gradle:7.2.2"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath 'org.jlleitschuh.gradle:ktlint-gradle:11.0.0'
     }
 }
 
+plugins {
+    id "com.android.library"
+    id "kotlin-android"
+    id "org.jlleitschuh.gradle.ktlint" version "11.0.0"
+}
+
+group "vn.hunghd.flutterdownloader"
+version "1.0-SNAPSHOT"
+
 rootProject.allprojects {
     repositories {
         google()
         mavenCentral()
     }
 }
 
-apply plugin: 'com.android.library'
-apply plugin: 'org.jetbrains.kotlin.android'
-apply plugin: "org.jlleitschuh.gradle.ktlint"
-
 android {
-    compileSdkVersion 32
+    compileSdk 32
 
-    defaultConfig {
-        minSdkVersion 19
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
-    }
-    lintOptions {
-        disable 'InvalidPackage'
-    }
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
     sourceSets {
-        main.java.srcDirs += 'src/main/kotlin'
+        main.java.srcDirs += "src/main/kotlin"
+    }
+
+    defaultConfig {
+        minSdk 19
+        targetSdk 32
     }
 }
 
 dependencies {
-    implementation 'androidx.work:work-runtime:2.7.1'
-    implementation 'androidx.annotation:annotation:1.4.0'
-    implementation 'androidx.core:core:1.9.0'
-    implementation 'androidx.fragment:fragment:1.5.2'
+    implementation "androidx.work:work-runtime:2.7.1"
+    implementation "androidx.annotation:annotation:1.5.0"
+    implementation "androidx.core:core-ktx:1.9.0"
 }

android/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-all.zip

android/settings.gradle

@@ -1 +1 @@
-rootProject.name = 'flutter_downloader'
+rootProject.name = "flutter_downloader"

android/src/main/kotlin/vn/hunghd/flutterdownloader/FlutterDownloaderPlugin.kt

@@ -89,7 +89,7 @@ class FlutterDownloaderPlugin : MethodChannel.MethodCallHandler, FlutterPlugin {
         openFileFromNotification: Boolean,
         isResume: Boolean,
         requiresStorageNotLow: Boolean,
-        saveInPublicStorage: Boolean, 
+        saveInPublicStorage: Boolean,
         timeout: Int,
         allowCellular: Boolean,
     ): WorkRequest {

android/src/main/kotlin/vn/hunghd/flutterdownloader/TaskDao.kt

@@ -55,7 +55,7 @@ class TaskDao(private val dbHelper: TaskDbHelper) {
         values.put(TaskEntry.COLUMN_NAME_RESUMABLE, 0)
         values.put(TaskEntry.COLUMN_NAME_TIME_CREATED, System.currentTimeMillis())
         values.put(TaskEntry.COLUMN_SAVE_IN_PUBLIC_STORAGE, if (saveInPublicStorage) 1 else 0)
-        values.put(TaskEntry.COLUMN_ALLOW_CELLULAR, if(allowCellular) 1 else 0)
+        values.put(TaskEntry.COLUMN_ALLOW_CELLULAR, if (allowCellular) 1 else 0)
         db.beginTransaction()
         try {
             db.insertWithOnConflict(

android/src/main/kotlin/vn/hunghd/flutterdownloader/TaskDbHelper.kt

@@ -12,10 +12,9 @@ class TaskDbHelper private constructor(context: Context) :
     }
 
     override fun onUpgrade(db: SQLiteDatabase, oldVersion: Int, newVersion: Int) {
-        if(newVersion == 4) {
+        if (newVersion == 4) {
             db.execSQL("ALTER TABLE ${TaskEntry.TABLE_NAME} ADD COLUMN ${TaskEntry.COLUMN_ALLOW_CELLULAR} TINYINT DEFAULT 1")
-        }
-        else if (oldVersion == 2 && newVersion == 3) {
+        } else if (oldVersion == 2 && newVersion == 3) {
             db.execSQL("ALTER TABLE " + TaskEntry.TABLE_NAME + " ADD COLUMN " + TaskEntry.COLUMN_SAVE_IN_PUBLIC_STORAGE + " TINYINT DEFAULT 0")
         } else {
             db.execSQL(SQL_DELETE_ENTRIES)

example/android/app/build.gradle

@@ -1,56 +1,50 @@
 def localProperties = new Properties()
-def localPropertiesFile = rootProject.file('local.properties')
+def localPropertiesFile = rootProject.file("local.properties")
 if (localPropertiesFile.exists()) {
-    localPropertiesFile.withReader('UTF-8') { reader ->
+    localPropertiesFile.withReader("UTF-8") { reader ->
         localProperties.load(reader)
     }
 }
 
-def flutterRoot = localProperties.getProperty('flutter.sdk')
+def flutterRoot = localProperties.getProperty("flutter.sdk")
 if (flutterRoot == null) {
     throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
 }
 
-def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
+def flutterVersionCode = localProperties.getProperty("flutter.versionCode")
 if (flutterVersionCode == null) {
-    flutterVersionCode = '1'
+    flutterVersionCode = "1"
 }
 
-def flutterVersionName = localProperties.getProperty('flutter.versionName')
+def flutterVersionName = localProperties.getProperty("flutter.versionName")
 if (flutterVersionName == null) {
-    flutterVersionName = '1.0'
+    flutterVersionName = "1.0"
 }
 
-apply plugin: 'com.android.application'
+apply plugin: "com.android.application"
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 33
+    compileSdk 33
 
-    namespace 'vn.hunghd.example'
+    namespace "vn.hunghd.example"
 
     defaultConfig {
-        // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "vn.hunghd.example"
-        minSdkVersion 19
-        targetSdkVersion 33
+        minSdk 19
+        targetSdk 33
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
     }
 
     buildTypes {
         release {
-            // TODO: Add your own signing config for the release build.
             // Signing with the debug keys for now, so `flutter run --release` works.
             signingConfig signingConfigs.debug
         }
     }
-
-    lint {
-        disable 'InvalidPackage'
-    }
 }
 
 flutter {
-    source '../..'
+    source "../.."
 }

example/android/app/src/main/AndroidManifest.xml

@@ -29,7 +29,7 @@
                 android:resource="@drawable/launch_background" />
         </activity>
         <!-- Don't delete the meta-data below.
-             This is used by the Flutter tool to generate GeneratedPluginRegistrant.java -->
+             This is used by the Flutter tool to generate GeneratedPluginRegistrant.kotlin -->
         <meta-data
             android:name="flutterEmbedding"
             android:value="2" />

…java/vn/hunghd/example/MainActivity.java …kotlin/vn/hunghd/example/MainActivity.ktexample/android/app/src/main/java/vn/hunghd/example/MainActivity.java renamed to example/android/app/src/main/kotlin/vn/hunghd/example/MainActivity.kt example/android/app/src/main/java/vn/hunghd/example/MainActivity.java renamed to example/android/app/src/main/kotlin/vn/hunghd/example/MainActivity.kt

@@ -2,6 +2,4 @@
 
 import io.flutter.embedding.android.FlutterActivity;
 
-public class MainActivity extends FlutterActivity {
-
-}
+class MainActivity : FlutterActivity()