Merge pull request #9 from msfjarvis/develop

app/build.gradle

@@ -10,8 +10,7 @@ def secretProperties = new Properties()
 secretProperties.load(new FileInputStream(secretPropertiesFile))
 
 android {
-    compileSdk 30
-    buildToolsVersion "30.0.3"
+    compileSdk 31
 
     defaultConfig {
         applicationId "at.sphericalk.gidget"
@@ -20,8 +19,8 @@ android {
         versionCode 2
         versionName "1.1"
 
-        buildConfigField "String", "CLIENT_ID", secretProperties["CLIENT_ID"]
-        buildConfigField "String", "CLIENT_SECRET", secretProperties["CLIENT_SECRET"]
+        buildConfigField "String", "CLIENT_ID", "\"${secretProperties["CLIENT_ID"]}\""
+        buildConfigField "String", "CLIENT_SECRET", "\"${secretProperties["CLIENT_SECRET"]}\""
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {
@@ -60,33 +59,33 @@ android {
 dependencies {
     coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:1.1.5")
 
-    implementation 'androidx.core:core-ktx:1.6.0'
-    implementation 'androidx.appcompat:appcompat:1.3.1'
-    implementation 'com.google.android.material:material:1.4.0'
+    implementation 'androidx.core:core-ktx:1.7.0'
+    implementation 'androidx.appcompat:appcompat:1.4.1'
+    implementation 'com.google.android.material:material:1.5.0'
     implementation "androidx.compose.ui:ui:$compose_version"
     implementation "androidx.compose.material:material:$compose_version"
     implementation "androidx.compose.ui:ui-tooling:$compose_version"
     implementation "androidx.compose.material:material-icons-extended:$compose_version"
-    implementation 'androidx.activity:activity-compose:1.3.0'
+    implementation 'androidx.activity:activity-compose:1.4.0'
 
     // lifecycle
-    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.3.1'
-    implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.3.1'
+    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.4.1'
+    implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.4.1'
 
     // browser
-    implementation "androidx.browser:browser:1.3.0"
+    implementation "androidx.browser:browser:1.4.0"
 
     // navigation
-    implementation "androidx.navigation:navigation-compose:2.4.0-alpha04"
+    implementation "androidx.navigation:navigation-compose:2.5.0-alpha03"
 
     // accompanist
-    implementation "com.google.accompanist:accompanist-insets:0.13.0"
-    implementation "com.google.accompanist:accompanist-coil:0.13.0"
-    implementation "com.google.accompanist:accompanist-swiperefresh:0.13.0"
-    implementation "com.google.accompanist:accompanist-systemuicontroller:0.13.0"
+    implementation "com.google.accompanist:accompanist-coil:0.15.0"
+    implementation "com.google.accompanist:accompanist-insets:0.23.1"
+    implementation "com.google.accompanist:accompanist-swiperefresh:0.23.1"
+    implementation "com.google.accompanist:accompanist-systemuicontroller:0.23.1"
 
     // datastore
-    implementation "androidx.datastore:datastore-preferences:1.0.0-rc02"
+    implementation "androidx.datastore:datastore-preferences:1.0.0"
 
     // hilt
     implementation "com.google.dagger:hilt-android:$hilt_version"
@@ -95,16 +94,16 @@ dependencies {
     // networking
     implementation "com.squareup.retrofit2:retrofit:2.9.0"
     implementation "com.squareup.retrofit2:converter-moshi:2.9.0"
-    implementation "com.squareup.okhttp3:logging-interceptor:4.9.1"
+    implementation "com.squareup.okhttp3:logging-interceptor:4.9.3"
 
-    implementation "androidx.work:work-runtime-ktx:2.5.0"
+    implementation "androidx.work:work-runtime-ktx:2.7.1"
     implementation 'androidx.hilt:hilt-work:1.0.0'
     kapt 'androidx.hilt:hilt-compiler:1.0.0'
 
     // room
-    implementation "androidx.room:room-runtime:2.3.0"
-    implementation "androidx.room:room-ktx:2.3.0"
-    kapt "androidx.room:room-compiler:2.3.0"
+    implementation "androidx.room:room-runtime:2.4.2"
+    implementation "androidx.room:room-ktx:2.4.2"
+    kapt "androidx.room:room-compiler:2.4.2"
 
     // markwon for markdown support
     final def markwon_version = '4.6.2'

app/src/main/AndroidManifest.xml

@@ -24,6 +24,7 @@
         </activity>
         <activity
             android:name=".AuthActivity"
+            android:exported="true"
             android:theme="@style/Theme.Transparent"
             android:launchMode="singleTop">
             <intent-filter>

app/src/main/java/at/sphericalk/gidget/model/GithubUser.kt

@@ -27,7 +27,6 @@ data class GithubUser(
     val blog: String,
     val location: String,
     val email: String,
-    val hireable: Boolean,
     val bio: String,
     val twitter_username: String,
     val public_repos: Int,

build.gradle

@@ -1,9 +1,9 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
-    ext.kotlin_version = '1.5.10'
+    ext.kotlin_version = '1.6.10'
     ext {
-        compose_version = '1.0.0'
-        hilt_version = '2.37'
+        compose_version = '1.1.1'
+        hilt_version = '2.41'
     }
     repositories {
         google()
@@ -16,7 +16,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.1.0-alpha06'
+        classpath 'com.android.tools.build:gradle:7.3.0-alpha06'
         classpath "com.google.dagger:hilt-android-gradle-plugin:$hilt_version"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }

gradle.properties

@@ -16,6 +16,6 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
 # https://developer.android.com/topic/libraries/support-library/androidx-rn
 android.useAndroidX=true
 # Automatically convert third-party libraries to use AndroidX
-android.enableJetifier=true
+android.enableJetifier=false
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official