Skip to content

Commit

Permalink
Fixed socket timeout
Browse files Browse the repository at this point in the history
  • Loading branch information
thirdegg committed Sep 2, 2020
1 parent 0ddafa0 commit 7739d63
Show file tree
Hide file tree
Showing 4 changed files with 1,296 additions and 977 deletions.
83 changes: 43 additions & 40 deletions chromecast/build.gradle
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
apply plugin: 'com.android.library'
apply plugin: 'kotlin-android'
apply plugin: 'kotlin-android-extensions'
/*
apply plugin: 'com.google.protobuf'
*/
//apply plugin: 'com.google.protobuf'


android {
compileSdkVersion 29
Expand All @@ -13,7 +12,7 @@ android {
minSdkVersion 9
targetSdkVersion 29
versionCode 1
versionName "0.11.3"
versionName "1.0"

testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles "consumer-rules.pro"
Expand All @@ -26,15 +25,20 @@ android {
}
}

/*
sourceSets {
main {
proto {
srcDir "$projectDir/src/main/resources/protobuf/"
}
}
}
*/
compileOptions {
targetCompatibility JavaVersion.VERSION_1_8
sourceCompatibility JavaVersion.VERSION_1_8
}


// sourceSets {
// main {
// proto {
// srcDir "$projectDir/src/main/resources/protobuf/"
// }
// }
// }


}

Expand All @@ -56,30 +60,29 @@ dependencies {

}

/*
protobuf {
protoc {
// You still need protoc like in the non-Android case
artifact = 'com.google.protobuf:protoc:3.7.0'
}
plugins {
javalite {
// The codegen for lite comes as a separate artifact
artifact = 'com.google.protobuf:protoc-gen-javalite:3.0.0'
}
}
generatedFilesBaseDir = "$projectDir/src/main/generated"
generateProtoTasks {
all().each { task ->
task.builtins {
// In most cases you don't need the full Java output
// if you use the lite output.
// remove java
}
task.plugins {
javalite { }
}
}
}
}
*/

//protobuf {
// protoc {
// // You still need protoc like in the non-Android case
// artifact = 'com.google.protobuf:protoc:3.7.0'
// }
// plugins {
// javalite {
// // The codegen for lite comes as a separate artifact
// artifact = 'com.google.protobuf:protoc-gen-javalite:3.0.0'
// }
// }
// generatedFilesBaseDir = "$projectDir/src/main/generated"
// generateProtoTasks {
// all().each { task ->
// task.builtins {
// // In most cases you don't need the full Java output
// // if you use the lite output.
// // remove java
// }
// task.plugins {
// javalite { }
// }
// }
// }
//}
3 changes: 1 addition & 2 deletions chromecast/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.thirdegg.chromecast.api.v2">
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
<uses-permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE" />

</manifest>
Loading

0 comments on commit 7739d63

Please sign in to comment.